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: a19388e9 -s ours am: 7cfd97f3 -s ours am: e8b3973f -s ours" into udc-d1-dev-plus-aosp am: 92f4097b

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



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