Code review comments have suggested that this test is too long and difficult to understand. Split it into two tests and put some of the common setup into setup methods and statics. Bug: 173331190 Test: test-only change Change-Id: I9fa888c940d7048f1ba6836a5706fbdb84b5f5c9