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

[automerger skipped] Merge "DO NOT MERGE: SurfaceFlinger: Add Transaction#sanitize" into sc-v2-dev am: dbdd2e6c am: 973935f4 -s ours am: ad466e58 -s ours

am skip reason: subject contains skip directive

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



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