Merge changes I58e5d2a0,I59693819

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