[automerger skipped] DO NOT MERGE: Revert "Map TYPE_TRUSTED_APPLICATION_OVERLAY to system window type for A11y" am: 0cf0d420 am: 349eb4df -s ours am: 920515f4 -s ours am: 80116efe -s ours am: 7aa872f3 -s ours am: 0f9c8a34 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I563be18456b5fc7b26704581b039a449a4bede59