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

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

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

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

Change-Id: I98f65f508c2bba9f84daaa0723c3a452c8dfa449