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: 737e0c32 am: bcf623b8
Change-Id: Ic08b01b4e5266135706e5855dfdec85e9004fe52