Merge "Factor out telephony permission checks into a helper class."
am: 0ad67f0e28

Change-Id: I3b125a63682d6d682bc0bcd3ab097b21855a9555