Merge changes from topic "am-69bbabe4aa46467eb85a40ee75080959" into udc-d1-dev-plus-aosp am: c80b2300

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



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