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: I41d0e351486588c5d619538ecd76beafe246606b