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

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

Change-Id: I6779f52bf044d5b3e4a1149e09de5aad0bde8cc0