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: de78b18d -s ours am: d5a54556 -s ours am: 2f62185b -s ours am: fec2bbed -s ours am: 0d97ef85 -s ours am: a9849fca -s ours" into udc-dev-plus-aosp am: 31026745

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



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