Merge "[automerger skipped] [DO NOT MERGE] Check caller's uid in backupAgentCreated callback am: ff4b0f29 -s ours am: 9b5ea671 -s ours am: e1f15885 -s ours" into udc-d1-dev-plus-aosp am: ccac5bbb

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



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