[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: 01cd97b8 -s ours am: d6c32403 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I0c2945b698e4a13d74120f4649efa3b61b0b41b1