Merge "Factor out telephony permission checks into a helper class." am: 0ad67f0e28 am: 402f4b8f09
am: e6722bc447  -s ours

Change-Id: I7530ff0d72fce34aeccbd36d9d90b9150e6eae89