Merge changes from topic "presubmit-am-7a77b5bffdb04bf38bcec9ec17d4d6ee" into...

Merge changes from topic "presubmit-am-7a77b5bffdb04bf38bcec9ec17d4d6ee" into tm-qpr-dev-plus-aosp am: 5523175f

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



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