Merge changes from topic "bug158482162_rvc-qpr-dev" into rvc-qpr-dev

* changes:
  Fix DevicePolicyManager.isBackupServiceEnabled() breakage.
  BackupManagerService: Make new behavior conditional on ChangeId.
  Enforce BACKUP permission on Service end.