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

[automerger skipped] Merge "Implement filter-product" into main am: 0092cae0 am: e3f861fb am: d5136421 -s ours

am skip reason: Merged-In I42eb3e134c7aa120f6bbe2d26d311bd46b586595 with SHA-1 5fe521e5 is already in history

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



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