This reverts commit c0b4911670. These tests seem to be running now. Bug: T224605 Change-Id: If052e75376ea85d86d395b481f204d3d3049fb3f
c0b4911670