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

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

Change-Id: I9e4f6e9d05b4147196dbaf32a63b739d52fd73e9