[automerger skipped] Merge "Mark screen decorations as trusted overlays" into rvc-dev am: bb3f22df9a am: b075e50ad5 -s ours
am skip reason: Merged-In Ib276764edcf1acffe94e3db7397fd23aaaa5dbaa with SHA-1 620ee47b2a is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16222361
Change-Id: I2fa7fea30e892495b874ece02d3ed73b7b235b6e
This commit is contained in: