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: 58a3381c -s ours am: d2c9d051 -s ours am: 15fed65e -s ours am: a341a660 -s ours
  [automerger skipped] Initialize DrawingState::trustedOverlay to false in constructor am: b4a2d3a7 -s ours am: a939e7c7 -s ours am: 60476d1d -s ours am: 9222d9a6 -s ours