[automerger skipped] Merge "Mark screen decorations as trusted overlays" into...

[automerger skipped] Merge "Mark screen decorations as trusted overlays" into rvc-dev am: bb3f22df am: b075e50a -s ours am: 86e80702 -s ours am: a0812043 -s ours

am skip reason: Merged-In Ib276764edcf1acffe94e3db7397fd23aaaa5dbaa with SHA-1 620ee47b is already in history

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

Change-Id: I3d6908f71456175072b2ed1d398704fcc3bb8e6b