Merge changes from topic "am-b2f392edf061412196627ca584b13a2c" into tm-dev

* changes:
  [automerger skipped] Merge "DO NOT MERGE: SurfaceFlinger: Add Transaction#sanitize" into sc-qpr1-dev am: 7c8d637adf -s ours am: 35810e0967 -s ours am: 2b6cccf438 -s ours
  [automerger skipped] DO NOT MERGE: SurfaceFlinger: Add Transaction#sanitize am: 842a412840 -s ours am: 015db7e23e -s ours am: a94bffe370 -s ours