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 am: 71b01e3e
Change-Id: Ic7883f2f14b51196ba53a1e92fdf83d62a1d2027