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

Change-Id: Ie99893344ee81898260af6e49c384f914d64b172