Merge changes from topic "ms16-querysummary" am: b4ac36e28d am: 37c6a5c6cb am: 998d42def7 am: 11c1481daa

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

Change-Id: Ic13f4d8d648391baa7dee68b8e46542467ec4709