Merge "Update the ZYGOTE_OWNER file" into main am: 0ae8a2dd4d am: 82eb7cc396

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

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