Merge "Add support for swiping back to the shortcut that launched the activity" into sc-dev am: b837f5040e am: 1149088e15

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

Change-Id: Id4e8c0fc73f6efa46f6539f9b68686a92ac415ad