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

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

Change-Id: Idb49286c7bdc5e27fbe09ab064020964e22face2