Merge "Reexport operator!= overloads in the derived type to avoid ambiguous...

Merge "Reexport operator!= overloads in the derived type to avoid ambiguous base class lookups" into main am: 3a3c1dfd

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



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