Merge changes from topic "ms16-querysummary" am: b4ac36e28d

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

Change-Id: I3c51ec1fb523958b6adebe68f19a4d6a60346a62