Revert "Revert"

Reverts android-armv7a-belalang-tempur/android_frameworks_opt_telephony#1