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: 58a3381c4f -s ours am: 858f8bb561 -s ours am: 3d961418d4 -s ours am: bfb51bb9a2 -s ours am: ee4a62953e -s ours
  [automerger skipped] Initialize DrawingState::trustedOverlay to false in constructor am: b4a2d3a77a -s ours am: 4cdd9efd68 -s ours am: ead70849bc -s ours am: 60972e9dff -s ours am: b704516b04 -s ours