[automerger skipped] Merge "Verify UID of incoming Zygote connections." into...

[automerger skipped] Merge "Verify UID of incoming Zygote connections." into sc-dev am: eca6d61e am: 4019f500 am: a2966c02 -s ours am: 2bdcbf59 -s ours

am skip reason: Merged-In I3f85a17107849e2cd3e82d6ef15c90b9e2f26532 with SHA-1 f1d4b34a is already in history

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



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