Merge "Fix 3 button mode issues in AllSetActivity" into udc-qpr-dev am: 7738b6e9 am: 0eba94ad

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



Change-Id: Id0fde9bc3939be62aaa97714956607cfee6a93f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>