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: 6ea4c7f0
Change-Id: Ie9a7d60d6ea0f206eab24a3f3b7cad43d3a54e98