Merge "Implement filter-product" into main am: 0092cae047 am: e3f861fb87

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

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