Merge "swapchain: Fix MAILBOX and SHARED presentation modes" am: d8fab5e82a am: 6ef5325273 am: edd7b142cf

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

Change-Id: I0315470c5c7e6da47f568dc9964df1495b214a8b