[automerger skipped] Merge "Only allow system apps to be forceQueryable" am:...

[automerger skipped] Merge "Only allow system apps to be forceQueryable" am: 34108ebb am: 775db185 am: 304d3b95 am: c0e064f8 -s ours am: 42c0ba90 -s ours

am skip reason: Change-Id Ib217ade392500f97a7ff5a08b781cc99e60838ff with SHA-1 697c2f94 is in history

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

Change-Id: If54cdf432585d5dce0f848f81a3aa2e5d387c64f