[automerger skipped] Merge "[DO NOT MERGE] Check caller's uid in...

[automerger skipped] Merge "[DO NOT MERGE] Check caller's uid in backupAgentCreated callback" into tm-dev am: c22386ba am: d93e1c05 -s ours am: 8b3aa8fe -s ours am: 9fe9e1cb -s ours am: 19db6e0b -s ours am: f700ecdc -s ours

am skip reason: subject contains skip directive

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



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