[automerger skipped] Merge "DO NOT MERGE: Revert "Map...

[automerger skipped] Merge "DO NOT MERGE: Revert "Map TYPE_TRUSTED_APPLICATION_OVERLAY to system window type for A11y"" into rvc-qpr-dev am: 3d570b73 -s ours am: 3c33bfd1 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16230862

Change-Id: I55b3bed800158e4ab0db4ea8be1e4c3413fa2621