Merge changes If2c82082,I03532b80 into udc-dev am: 66e7ec721b am: 1b12262d07

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

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