[automerger skipped] Merge "BlastBufferQueue: Keep transform hint in Surface...

[automerger skipped] Merge "BlastBufferQueue: Keep transform hint in Surface consistent" into sc-dev am: 4c969b34 am: 3a3c9b0c -s ours

am skip reason: Merged-In Id84a3a650ce68878e5638b942249c11558fd29eb with SHA-1 a4fbca56 is already in history

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

Change-Id: I07b656899c1a3f026a2872d160df11afe55ddf63