Merge "Move a few files from frameworks/opt/telephony to frameworks/base."