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

Change-Id: I4edfa7f78dc60bef5d681b0ae268f1d1f1d15b03