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 am: 5e824589

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

Change-Id: I30674020def53126838918117539c98459045a85