Merge changes from topic "am-929047f04f63492aa317e461df695a23" into...

Merge changes from topic "am-929047f04f63492aa317e461df695a23" into tm-d1-dev-plus-aosp am: 379b59a4

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



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