[automerger skipped] Merge "Grant shell QUERY_USERS and MODIFY_QUIET_MODE" am: de2340c0 am: c3ef3846 am: dc49545f -s ours am: d6a2637b -s ours

am skip reason: Change-Id Ifa14d24ee1873161e3986e8d0669fd47a7bcaa7a with SHA-1 c60281bd is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1df070fe1b040756c49aa100d473c65974614d5c