Merge "Add exclusion / inclusion filter options to..." into main am: 9fd0c6a7ba am: 6fcc751b9c

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3326258

Change-Id: Ie6ab557807be34db9604088f13558aeafa63e38e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>