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

Change-Id: I4ddb49575f423237be4f354bbf37c5bce56fa958