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

[automerger skipped] DO NOT MERGE: Revert "Map TYPE_TRUSTED_APPLICATION_OVERLAY to system window type for A11y" am: 0cf0d420 am: 4e586049 -s ours am: 6b511318 -s ours am: 8d26628c -s ours am: 71f0b196 -s ours am: b6fcbd6e -s ours

am skip reason: subject contains skip directive

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

Change-Id: I212a8630824992323268d5ecc6bc0a00ea3cebc1