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

am skip reason: subject contains skip directive

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

Change-Id: I56955e85820b0455e4928d5830b18e02b978f768