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

Change-Id: I103ba7c527b21b6afbbe1adb9e5361821c01880d