[automerger skipped] Convert InputClassifierTest to parametrized test am: 0a51242abc am: dd13a58a9d -s ours

am skip reason: Change-Id I5df4eff845fd49b8663d1589c5314d5acf4b5057 with SHA-1 0a51242abc is in history

Change-Id: Ife1a125f91583fdfd8343f459b0d138d260f85ea