Merge "VendorExtension conversion: _ext is defined not used" into main am:...

Merge "VendorExtension conversion: _ext is defined not used" into main am: 206543e3 am: 41477f34

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



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