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

Data-enabled tablets need love, too

Change-Id: I239823f198260d0f045c6e7305cf04082a8ef1e9
(cherry picked from commit 53df1df11e0718ea12d7e9b52ea6b7bab876b3f2)