[automerger skipped] Merge "Makes TYPE_NOTIFICATION_SHADE as trusted overlay" into rvc-dev am: 7fb7a6a1 am: 7830f754 -s ours

am skip reason: Change-Id I3362186b22505d21ec6e0ad779d4a26304ed782c with SHA-1 9499a112 is in history

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

Change-Id: I243a271f8135e1e0a49de0b7101333190009b6d3