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

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

Change-Id: Id2c4c109fc89ac853c5846e5fa60d045e7df6e2d