Merge "[automerger skipped] [DO NOT MERGE] Check caller's uid in backupAgentCreated callback am: 4a82aa85 -s ours am: a32cac65 -s ours am: 0b29446a -s ours am: 4383f7c1 -s ours am: 6cfe1385 -s ours" into udc-d1-dev-plus-aosp am: 53ff5162

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



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