Merge changes I6c89c639,I6cab9202 into tm-qpr-dev am: 4ee5c429 am: 87b61add

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



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