Merge "Require privapp grants for all launcher3 apps"