C2 VTS: Cleanup code around query() calls am: f1c7514ab7 am: ca0d4c8f87

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

Change-Id: I3d4f98ee0b3abdb5094aa927171a8ee842b3fd84