Merge changes Idae0c3d8,I8c599912 into tm-qpr-dev am: 39768edb67 am: 9ec55062c2

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

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