Merge "Initialize DrawingState::trustedOverlay to false in constructor" into stage-aosp-master