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: 52b91363 am: c751a8bf -s ours am: de5f3110 -s ours am: e6f236a0 -s ours am: 4b29029c -s ours am: c41fcbaa -s ours am: f75c6508 -s ours am: 94e32c70 -s ours am: 8592e364 -s ours" into udc-d1-dev-plus-aosp am: 7db957f3

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



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