Merge changes Ic4c5cd96,I2cc2417f into udc-dev am: 087bf95bb6

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

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