Revert "Merge branch 'kk' of https://github.com/snak3ater/android_packages_services_telephony into kk"

This reverts commit 9be93dcaf7618a1782e24f481bbaefe6ac1d19fe, reversing
changes made to b2d6602ca3aac7872ecc617025761f37c3976ebb.