Merge "Add hook for intercepting query" into rvc-dev am: b4cc5f4a55 am: afca2d9166

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

Change-Id: I3014aacbcaa3164441b150e1964f422ddac8180f