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

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

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