Merge "Grant shell QUERY_USERS and MODIFY_QUIET_MODE" am: de2340c0e9 am: c3ef384607

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5798dec22b49c4408b3d030fd5d447636350d09d