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

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

Change-Id: I3c51ec1fb523958b6adebe68f19a4d6a60346a62
tree: a19b0ee7b69b05e7ae61788dbdeca2ca1f7b6221
  1. core/
  2. framework/
  3. framework-t/
  4. service-t/
  5. services/
  6. tests/