tree ad04f4d5049ddeb9299f23211fcde8968ae046d5
parent eac11b669d9b47089a6a4a1afa87427447436225
parent e01e5dda78c9e8cb16cf8e3fece928fc56c21078
author Xin Li <delphij@google.com> 1624255817 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1624255817 +0000

[automerger skipped] Merge "DO NOT MERGE - Merge RQ3A.210605.005" am: e01e5dda78 -s ours

am skip reason: Merged-In I5e4b540f169d365c60cf4461e19cda24009f325d with SHA-1 eac11b669d is already in history

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

Change-Id: Ie632fbf17c1938e781d817df57f1c250d8663df0