Cleanup Apex E2E-test base class am: 8ebfc34fb8

Original change: undetermined

Change-Id: Ie559fce73fd54bf7dd0053634521d7162c2e8b68