Merge "Add android.permission.MANAGE_SCOPED_ACCESS_DIRECTORY_PERMISSIONS"