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: b7c0beda
Change-Id: I24ec5419c8ecdb422ba4a758ade0b66d0dab38ed