[automerger skipped] Merge "[DO NOT MERGE] Check caller's uid in backupAgentCreated callback" into tm-dev am: c22386ba6a am: d93e1c057e -s ours am: 8b3aa8fef0 -s ours am: 9fe9e1cbc6 -s ours

am skip reason: subject contains skip directive

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

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