[automerger skipped] Merge "Add OBSERVE_ROLE_HOLDERS permission to shell." am: 3d8cef1fa8 am: 7e9b5b3c76
am: 50f59c1c9b -s ours
am skip reason: change_id I5c979a26dae103ea1b633c2119c59363d8953aa2 with SHA1 abf0d98d61 is in history

Change-Id: I5be20d4dcb1d30740aa8e152e8433e7e3ee7fbbd