[automerger] Add @Test and @Ignore to untested test methods. am: 1aaaac8343

Change-Id: Ife9d31c9cf55e17275f8dfa0b70662a94948d395