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

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

Change-Id: If057735d8f6cc917a7f62d689bd3154716fe281a