Merge "Don't request concrete comparison operators" into main am: 5fdac6d1...

Merge "Don't request concrete comparison operators" into main am: 5fdac6d1 am: 8b803482 am: 486dee82

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2903191



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