[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: 8ed8e895 -s ours

am skip reason: subject contains skip directive

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



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