Merge changes I8ccf962f,I383c7540 into udc-dev am: 28a8d5a14c

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

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