Merge changes from topics "presubmit-am-0ed6d9a2502540239b46d7d3573bd44e",...

Merge changes from topics "presubmit-am-0ed6d9a2502540239b46d7d3573bd44e", "presubmit-am-7a77b5bffdb04bf38bcec9ec17d4d6ee" into tm-qpr-dev am: f5837869

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



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