Merge "fix a bug that extra is not actually set to the query." into sc-qpr1-dev am: c0992e4ec4 am: ec092ff04a am: 8e8ff2d862
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15537322 Change-Id: I7139620a170b31def70b256c2def64055b376cc5
This commit is contained in: