[automerger skipped] Merge "Add apex_e2e_test_defaults" am: c0d015888f am: 0896a70519 am: 82ea2b5810 -s ours
am skip reason: Change-Id Ia244d1502cfc3cb93963f345f139847c052288c2 with SHA-1 3116ae361e is in history

Change-Id: I27522ef8f1bff3996c4b31efd3049bfca8a3211f