Merge changes from topic "am-7f85af98744840e5a63dc172f3676c6c" into rvc-d1-dev-plus-aosp
* changes:
Merge "DO NOT MERGE: Map TYPE_TRUSTED_APPLICATION_OVERLAY to system window type for A11y" into rvc-dev am: cf7f7ca7 am: 5f2443d3
DO NOT MERGE: Map TYPE_TRUSTED_APPLICATION_OVERLAY to system window type for A11y am: 4ec7b5c3 am: e4dbd0e2