Merge changes from topic "am-391c166e52474daab78af5eb8cc04d0c" into udc-qpr-dev-plus-aosp

* changes:
  [automerger skipped] Merge "[DO NOT MERGE] Check caller's uid in backupAgentCreated callback" into tm-dev am: c22386ba am: d93e1c05 -s ours am: 8b3aa8fe -s ours am: 9fe9e1cb -s ours am: 19db6e0b -s ours
  [automerger skipped] [DO NOT MERGE] Check caller's uid in backupAgentCreated callback am: c31434d6 am: 278486a8 -s ours am: b5815ea9 -s ours am: b45ea238 -s ours am: 38e3d9c1 -s ours