[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: d6d09e43 am: 958c37e4 -s ours am: 00b0dc37 -s ours am: c818d608 -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/+/27069625



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