Merge changes I6c89c639,I6cab9202 into tm-qpr-dev am: 4ee5c429fe am: 87b61adde5 am: 322c008b07 am: 96b569fad5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21407904 Change-Id: Iac4cc021c26c79bc7d06e471ba065d2e8219cc3e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: