Merge "Re-enable testAppZygoteServices in pre-submit."