Merge "Fix DevicePolicyManager.isBackupServiceEnabled() breakage." into rvc-qpr-dev-plus-aosp