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

Change-Id: I9c290324829f2c84c3179876d668e15dac836913