Merge "Remove cell broadcast and shell from telephony permission" into rvc-dev am: d944bcf2c3 am: ee1405f706 am: c0a3bfae72

Change-Id: I774c3012fcfe9e220e51dbe771df2aacbc6ed852