[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: df6d7fef am: 1cf4f465 -s ours am: f36da068 -s ours am: c67cf221 -s ours

am skip reason: subject contains skip directive

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



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