Merge "Add MANAGE_ROLE_HOLDERS permission to shell."
am: a2ccaf6e68

Change-Id: I438f8c30100d084582df74d104ec3f4063caba86