[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: 5448bd7e am: f159de0d am: ff0fc9a5 am: 93e55961 -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: If8131f390a962ec9d9c356056da7e3e2f2352937