Merge changes I03636e28,I6cf6d52e into tm-qpr-dev am: 41235d529b

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

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