Merge "Optimize matching logic for multiple requirements at once." into main am: 09315923

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3197315



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