[automerger skipped] Merge "Makes TYPE_NOTIFICATION_SHADE as trusted overlay"...
[automerger skipped] Merge "Makes TYPE_NOTIFICATION_SHADE as trusted overlay" into rvc-dev am: 7fb7a6a1 am: f86f5cbf am: d325dda9 -s ours
am skip reason: Change-Id I3362186b22505d21ec6e0ad779d4a26304ed782c with SHA-1 9499a112 is in history
Change-Id: I746419076823c738adcfe67053fb070c4b3eca62