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: 3daa6a20 -s ours am: 6e9c41a0 -s ours am: ea4ebe49 -s ours am: 5f738cba -s ours am: d858b56e -s ours am: 943fbdda -s ours am: 8b7613ca -s ours am: 4341b589 -s ours" into udc-d1-dev-plus-aosp am: 774d6a44

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24323542



Change-Id: If1f2c081fec4fc5f1d34a1a2142fefed25058918
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>