[automerger skipped] Merge "Makes TYPE_NOTIFICATION_SHADE as trusted overlay" into rvc-dev am: 7fb7a6a1a5 am: f6e75922ca -s ours am: 848ea235df -s ours am: e2a045c17e -s ours

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

Change-Id: I55802245f0714ba9509a3065470a53e7b023a287