Merge "use SmsCbMessage.MESSAGE_FORMAT_3GPP to replace hidden SmsMgr APIs"