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

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

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