mergeup: merge frameworks/opt/telephony upstream