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

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

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