[automerger skipped] Convert InputClassifierTest to parametrized test am:...
[automerger skipped] Convert InputClassifierTest to parametrized test am: 0a51242a am: dd13a58a -s ours am: ccfef3dd -s ours
am skip reason: Change-Id I5df4eff845fd49b8663d1589c5314d5acf4b5057 with SHA-1 0a51242a is in history
Change-Id: Ic1684ca97f4551cd0745c233fbfcbcc69f927c80