Merge "Move a set of app privapp grants to /product" am: 65f8be9940
am: 65200e83c2

Change-Id: If1fc81104d65caa2a03d6763ec7df01a42df0cad