Merge "system_app: remove adb data loader permissions"