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

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

Change-Id: If0d5b7a0ac880d4fc954c12f7b8b4ea945fd32e5