[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 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: I36cfc41594cb6143cc263f19214cde96c214fe4c