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

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

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