Merge "Only allow system apps to be forceQueryable" am: 34108ebb9e am: 775db18508 am: 304d3b95c5

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

Change-Id: I8fcc111d329d1681224f49bfa3d8a3ffcde7548c