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: Iee6631b363e2abddc2f02c7fb32395c11f7d6b3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>