Trace Redaction - Consolidate Filters

There were two filter types checking the same things. This replaces
them with a more general filter interface. This should make it
easier to implement filters correctly.

Change-Id: I6c6488428d6c2134ee668077bf1b9302da220044
diff --git a/Android.bp b/Android.bp
index dbac421..2b9993f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -13608,6 +13608,7 @@
         "src/trace_redaction/collect_system_info.cc",
         "src/trace_redaction/collect_timeline_events.cc",
         "src/trace_redaction/filter_packet_using_allowlist.cc",
+        "src/trace_redaction/filtering.cc",
         "src/trace_redaction/find_package_uid.cc",
         "src/trace_redaction/modify_process_trees.cc",
         "src/trace_redaction/populate_allow_lists.cc",