Merge "[automerger skipped] [DO NOT MERGE] Check caller's uid in...

Merge "[automerger skipped] [DO NOT MERGE] Check caller's uid in backupAgentCreated callback am: 52b91363 am: c751a8bf -s ours am: de5f3110 -s ours am: e6f236a0 -s ours am: 4b29029c -s ours am: c41fcbaa -s ours am: f75c6508 -s ours am: 94e32c70 -s ours am: 8592e364 -s ours" into udc-d1-dev-plus-aosp