Merge "Require privapp grants for all launcher3 apps" am: 35d5c05428
am: 3103281161

Change-Id: I91ce199421c8203d89dd7f242955e20b57551a28