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

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

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