[automerger skipped] Synchronize surface transaction am: 0a2076e8d3 am: e3cf162169 -s ours am: 6a597e7692 -s ours am: 3db090380c -s ours

am skip reason: Merged-In I1636a1ded4f9dd84c54ba12239e3549b92ed7567 with SHA-1 0a2076e8d3 is already in history

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

Change-Id: I0be94b96720911a0506dff564f6d4714ad6bd7b9