Merge changes from topic "am-db801d2101f744bba791ae3c7a8cc342" into tm-qpr-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: df55e941 -s ours am: f0c6344c -s ours
  [automerger skipped] Initialize DrawingState::trustedOverlay to false in constructor am: b4a2d3a7 -s ours am: a939e7c7 -s ours am: 60476d1d -s ours am: eb02f7eb -s ours am: 8c948e91 -s ours