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: 1d0323b8
Change-Id: I11911a5a4293deb766e0cec9f59de0be43154ffd