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: 4a82aa85 -s ours am: a32cac65 -s ours am: 0bc98f0b -s ours am: 7ee84ae2 -s ours am: 4ac7c4dd -s ours am: 75351143 -s ours" into udc-d1-dev-plus-aosp am: 6b22424c

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



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