Merge changes from topic "am-1b5ff54850484f67a65c2bda86eb0cf0" into...

Merge changes from topic "am-1b5ff54850484f67a65c2bda86eb0cf0" into tm-qpr-dev-plus-aosp am: bfb22371

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



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