Merge "Adds cacheFlags parameter to cache/uncacheShortcuts() methods" into rvc-dev am: c95be6995a am: 8e635202f4

Change-Id: I69b9a29abae6816c79826e704c4d316d255c8cc4