Merge "Suppress ordered-compare-function-pointers warning" am: 9117f884ed

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

Change-Id: I5fcd45529202b90996548c8019467735ee30f6d0