Merge "Adds test to verify cached shortcuts don't count against the limit"...
Merge "Adds test to verify cached shortcuts don't count against the limit" into rvc-dev am: e0fb2c72 am: 34888420 am: 997185b1 am: e164c162
Change-Id: I550f27b613d444ce3cc902dfcf99ee97e01a2190