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

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



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