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

* changes:
  BackupManagerService: Make new behavior conditional on ChangeId.
  Enforce BACKUP permission on Service end.