[automerger skipped] Merge "Makes TYPE_NOTIFICATION_SHADE as trusted overlay" into rvc-dev am: 7fb7a6a1a5 am: f86f5cbf9f am: d325dda9c0 -s ours am: 527203d423 -s ours

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

Change-Id: Ia8fed59a6c80fdde39f427c82c6e763e64c7484c