[automerger skipped] Merge "Re-land: Reconcile Zygote process name code with Q release." into stage-aosp-master am: 0b5937472e
am: c272f94077 -s ours
am skip reason: change_id Ice3eb966a88e6de5bc8834b60b54bcac31bf31db with SHA1 0d1890b0e0 is in history

Change-Id: Ie7a2592fc2b2ad61fa46690924bc22fa5f01ed5c