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
Change-Id: I7fe50e51456bc600c69341f4648f2f514915e855