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

Change-Id: I17785c22cfed23ee492d63f8b060e978bffdc346