[automerger skipped] Merge "DO NOT MERGE: SurfaceFlinger: Add...

[automerger skipped] Merge "DO NOT MERGE: SurfaceFlinger: Add Transaction#sanitize" into sc-qpr1-dev am: 7c8d637a -s ours am: 35810e09 -s ours am: 2b6cccf4 -s ours am: 4605794f -s ours am: 51a6958c -s ours am: 74a95a82 -s ours

am skip reason: subject contains skip directive

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



Change-Id: I2fb0579b45578b80d275dda43d775c6083103f5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>