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: I7c356bcc0d3ddefec368c2ab6da3a31c97983dae