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