Merge "Revert "Refactor CallFilteringResult to use a builder""
am: f8d0241b76

Change-Id: I1796f929024cdf1e745cc669ae91b18acc715cf6