Merge changes I1136ede4,I5f0877fe into udc-dev am: 106d91d04c

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

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