Fixed the ability to filter by multiple class/methods combinations

bug: 16034525
Change-Id: Id8f81b09c51f66ffd6e77bb58d9684167b2e55ba
(cherry picked from commit d904d52274bafc1fd3928c6b428fed4717e30b4a)
5 files changed