Merge "[automerger skipped] [DO NOT MERGE] Check caller's uid in backupAgentCreated callback am: ebdcc72a am: d5b33232 -s ours am: ea505b77 -s ours am: 6b6806cd -s ours am: cf8d6134 -s ours am: 4c8fd7f8 -s ours am: c843519f -s ours" into udc-d1-dev-plus-aosp am: 1ae796ef

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



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