Merge "Factor out telephony permission checks into a helper class." am: fc5d8c8f31 am: 5275c0b123
am: 644c763b0d  -s ours

Change-Id: I151703d7cb39b7dca2cbe10a572de5c3c4f00826