Merge changes Iaf02a42a,I8daf3c08 into tm-qpr-dev am: 1a4eb297ee

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

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