Merge changes from topic "tc_change_23041807_34" into tm-qpr-dev-plus-aosp am: 951f9268

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



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