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

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

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