Update shortcut queries

- Include cached shortcuts also
- Require long lived flag

Test: atest
Fixes: 149925743
Change-Id: If3e50d2ffdc82308a503bce13fc28443fb77a6b6
5 files changed