Merge changes from topic "am-abeeeb4b43c14bdb8288791378a8a8fd" into udc-d1-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: 8ddd4dc5 -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: ea0667bf -s ours