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

[automerger skipped] Merge "Verify UID of incoming Zygote connections." into tm-dev am: d5163321 am: f538fb95 -s ours am: b0a68c71 -s ours

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

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



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