Merge "Enable shader cache for applications that shared UID with multiple packages too" into nyc-mr1-dev am: 6b5d4723d2 am: a1050aff1d
am: a43ff9cb73

Change-Id: I90b303650d7d7fbf10615c554cb7a3c0a4edd38c