Merge "Add DeviceConfig permissions to manifest so that AppCompactorTest can run after permissions are enforced."