Merge "Uncache the shortcuts when Android system shuts down if the...
Merge "Uncache the shortcuts when Android system shuts down if the notification settings are not changed" into rvc-dev am: d8146082 am: 55ace5b7 am: 153472e9 am: 1a996990 am: 98f8b4fd
Change-Id: I1b5027ca94468dfa2372a27d0209bab945b43e62