Android 4.0.3 CTS release 2
DO NOT MERGE Fix generic filter check

 Bug: 5768794
 Cherry pick from master

Change-Id: I7bace7a33fe1601039a5aacc5c3af7167d566a1d
1 file changed