Merge "Remove no longer needed QUERY_USERS permission" am: 0969f50292 am: 1a47316d2e

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

Change-Id: I7cbb1d9b86e2ce750dfcdb8e0f13759029d0f62c