Merge "Re-enable testAppZygoteServices in pre-submit."
am: b5cc2bfea0

Change-Id: I5d25de8e82396de50340887870e9daf7dbba389c