Merge changes If4669756,Ide702745 into udc-dev am: 77a40999e1

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

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