Merge "Include cache-only and pinned-only shortcuts as Sharing shortcuts as...
Merge "Include cache-only and pinned-only shortcuts as Sharing shortcuts as well" into rvc-dev am: 666796b0 am: 663821fd
Change-Id: I26ae97644a13afe8d765d00c304a1cf9f05fa583