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

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

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



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