Merge "CDD: Require user affordances to grant/revoke PACKAGE_USAGE_STATS permission." into oc-dev