Merge "Fixing shortcut intent getting cleared during backup/restore" into sc-dev am: 40ff7e4e41

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/13556170

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9c406179961b52ad7af40698b396b5c50b039e22