[automerger skipped] Merge "BlastBufferQueue: Keep transform hint in Surface consistent" into sc-dev am: 4c969b34bb -s ours am: 45520d82a9 -s ours

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

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

Change-Id: I97828c7ab803058f1cf6b64c3fd9f3874dfa3263