[automerger skipped] Merge "Reconcile Zygote process name code with Q release." am: 980681e525 am: d0390c9335 -s ours am: fec4a74148 -s ours
am: 518eb96645 -s ours
am skip reason: change_id I2bce277ff8f2de4614e19d5385fe6712b076f9c9 with SHA1 a5e4422d14 is in history

Change-Id: Idc0a4de8ae28ab45834501dbcaa04d48c01806f7