Merge changes from topic "running-in-test-camel" into tm-qpr-dev am: d2d29138

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



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