Merge changes from topic "am-bffb9ddeb0de4c15a168076e3071b9c6" into...

Merge changes from topic "am-bffb9ddeb0de4c15a168076e3071b9c6" into udc-d1-dev-plus-aosp am: ceb57910

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



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