Merge "Add OBSERVE_ROLE_HOLDERS permission to shell." am: 3d8cef1fa8
am: 7e9b5b3c76

Change-Id: Id4d01bd50fe78b06f86dc1dfa946f1016ed08864