Merge "Merge "Cache the shortcut when the associated notifications are posted...
Merge "Merge "Cache the shortcut when the associated notifications are posted and uncache when they are gone" into rvc-dev am: 7095f4c9 am: 24e69902 am: 01696728 am: de03b62a" into rvc-qpr-dev-plus-aosp am: 805bcea0
Change-Id: Ic93057ba91aa4a5a4b2fe2f5fc3fffc6eb4ff9d6