[automerger skipped] Merge "BlastBufferQueue: Keep transform hint in Surface consistent" into sc-dev am: 4c969b34bb am: 5388efc03d -s ours am: 6211929ab9 -s ours

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

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

Change-Id: I728f96b82e5fe0156d3c66b941fbca86a966c76f