Merge "fix a bug that extra is not actually set to the query." into...

Merge "fix a bug that extra is not actually set to the query." into sc-qpr1-dev am: c0992e4e am: b92a3cfc

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

Change-Id: I260a6247b54d4f4e415bfb57c0eb968b8b47c57d