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

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

Change-Id: Ie996ba1238501c02f77217c500f86f39835f4758