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

[automerger skipped] Merge "Only allow system apps to be forceQueryable" into rvc-qpr-dev am: d04eb377 am: 32cfadf6 -s ours

am skip reason: Change-Id Ib217ade392500f97a7ff5a08b781cc99e60838ff with SHA-1 3438afa8 is in history

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

Change-Id: I272711eb15c0a3e4a7f4cd75484db62e76d30eb9