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

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

Change-Id: I71f6814b6bc29ec700b931c88956a888453f0414