Merge "Re-land: Reconcile Zygote process name code with Q release." into stage-aosp-master