[automerger skipped] Merge "Implement filter-product" into main am: 0092cae0...

[automerger skipped] Merge "Implement filter-product" into main am: 0092cae0 am: 4520c6d3 -s ours am: a8a75b22 -s ours

am skip reason: Merged-In I42eb3e134c7aa120f6bbe2d26d311bd46b586595 with SHA-1 2738abbd is already in history

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



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