Merge changes from topic "am-d3a277e5a5634b6e9b1b5859802bde21" into tm-d1-dev-plus-aosp

* changes:
  [automerger skipped] Merge "Initialize DrawingState::trustedOverlay to false in constructor" into sc-dev am: 58a3381c4f -s ours am: d2c9d0517b -s ours am: 15fed65e27 -s ours am: a341a660b8 -s ours
  [automerger skipped] Initialize DrawingState::trustedOverlay to false in constructor am: b4a2d3a77a -s ours am: a939e7c71c -s ours am: 60476d1d11 -s ours am: 9222d9a6c3 -s ours