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

Merge changes from topic "am-a4fc79aa8a7f4f2bbfed940ed8f78c83" into tm-qpr-dev-plus-aosp am: 74970f33

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



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