[automerger skipped] C2 VTS: Cleanup code around query() calls am: f1c7514a...

[automerger skipped] C2 VTS: Cleanup code around query() calls am: f1c7514a am: ca0d4c8f am: ccb0da14 -s ours

am skip reason: Merged-In I3a910fcea6927f1ed48d2457d333a8bc92ee1dcf with SHA-1 f1c7514a is already in history

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

Change-Id: I3a01e58e3fff0b742a76884e25860e3f1e8bfb7f