[automerger skipped] Merge "Re-enable testAppZygoteServices in pre-submit." am: b5cc2bfea0
am: 7847f33b76 -s ours
am skip reason: change_id I2bce277ff8f2de4614e19d5385fe6712b076f9c9 with SHA1 a5e4422d14 is in history

Change-Id: I34a074b767dcb084616876f72fc48be801ba3ac5