Merge "Merge "Uncache the shortcuts when Android system shuts down if the...
Merge "Merge "Uncache the shortcuts when Android system shuts down if the notification settings are not changed" into rvc-dev am: d8146082 am: 6ea4c7f0" into rvc-d1-dev-plus-aosp