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

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



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