Merge "Move files from frameworks/opt/telephony to frameworks/base" into oc-dev-plus-aosp