Merge changes I865871e5,Ie655de7a into tm-qpr-dev am: 6e21d310c1

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

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