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

Change-Id: Id4d2229546b9a8469a6ec2abb897ec620f82995b