Merge changes from topic "am-4fd26709498342da93912fba9cfb0331" into...

Merge changes from topic "am-4fd26709498342da93912fba9cfb0331" into udc-qpr-dev-plus-aosp am: e69a4e89

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



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