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

Change-Id: I93034c3105c9f3857be8309a905e432a3c9b2005