Merge "Move back to end of screen on keyguard" into sc-v2-dev am: c5ae15b481

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

Change-Id: I8d6381fecfddfebfc5d7a3e9f67a3901b97f1180