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: 99468520" into rvc-d1-dev-plus-aosp am: 3e2f33b2 am: 5df592ee
Change-Id: I50a798ab286c928ab3580d1d11fefab243bf11a4