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

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

Change-Id: I7e18896d5700f7a28f9a07048a67a64b9a99a1bf