Make addCountAnd{Pass|Drop}IfR0Is{One|None}Of() support non empty set

Test: TH
Change-Id: I309ccf29bbb2a03f3091fc79595a146eb47b9c0b
3 files changed