Merge changes from topic "am-2a277b60e7f84401872ca9a832079778"

* changes:
  [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: 818cc552 -s ours am: 05540989 -s ours
  [automerger skipped] DO NOT MERGE: SurfaceFlinger: Add Transaction#sanitize am: ade0d07b am: aa1fffe4 -s ours am: 07fa9c09 -s ours am: 2035357d -s ours am: 45af14c8 -s ours