[automerger skipped] Merge "Remove no longer needed QUERY_USERS permission" am: 0969f50292 am: 1a47316d2e am: 2438eafdd4 -s ours

am skip reason: skip tag Change-Id I4e050d6ea7df08ba789021fd06e8c4cf8936dfe9 with SHA-1 1c1cc6c250 is already in history

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

Change-Id: I2f524d82de4b5165ae2e075856d609f1b44205fd