Don't assume phones are the only clients for the telephony configuration bits

Data-enabled tablets need love, too

Change-Id: I239823f198260d0f045c6e7305cf04082a8ef1e9
Merge remote-tracking branch 'cm/cm-10.2' into cm-10.2