Merge "Support query encapsulation information." into rvc-dev am: acc2acafe7 am: 69e62fbc61

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

Change-Id: Ic996de3eeb4ce5028666bee084d07bf58f3cee86