Merge "Only allow system apps to be forceQueryable" am: 34108ebb9e

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

Change-Id: I47e4d5ba2f0cad42b949493140f45a5fa8ee5006