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

Change-Id: Ie01d987cbc547424cee7d82d2ebc54192f492e4d