Merge changes from topic "am-82c46b2e17b548e8bc187fbfd553ea6b" 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: 858f8bb5 -s ours am: 3d961418 -s ours am: bfb51bb9 -s ours am: ee4a6295 -s ours
  [automerger skipped] Initialize DrawingState::trustedOverlay to false in constructor am: b4a2d3a7 -s ours am: 4cdd9efd -s ours am: ead70849 -s ours am: 60972e9d -s ours am: b704516b -s ours