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

[automerger skipped] Merge "DO NOT MERGE: SurfaceFlinger: Add Transaction#sanitize" into sc-dev am: 04caf0c7 am: c226dcf6 -s ours am: 5ffddadb -s ours am: f52e1690 -s ours

am skip reason: subject contains skip directive

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



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