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

Change-Id: I68d3899d973018615152082023c2d51414981d61