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

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

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