[automerger skipped] Merge "swapchain: Fix MAILBOX and SHARED presentation...

[automerger skipped] Merge "swapchain: Fix MAILBOX and SHARED presentation modes" am: d8fab5e8 am: 6ef53252 am: edd7b142 am: 5e0351be -s ours

am skip reason: Merged-In I9902d11aadf946a51c3f74e1462faf620a84a977 with SHA-1 16c443c6 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1907991

Change-Id: I2a1d63a5dd81ce8622a800257bca7ed620dcbc1c