[automerger skipped] Synchronize surface transaction am: 0a2076e8d3 am: e3cf162169 -s ours am: 6a597e7692 -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: I1b6e61939982309b77def5da241cca14c182a15b