[automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: ea991a4b...

[automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: ea991a4b -s ours am: 3856824f -s ours am: 5663dd50 -s ours am: 18e05526 -s ours am: 2b650232 -s ours

am skip reason: Change-Id Ia11967c6f4cb86b5431cdb446a5b5c483ce09ba2 with SHA-1 6cf1e6ca is in history

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

Change-Id: Ib6cac041533db62573aa037b3ff395d909784357