[automerger skipped] use SmsCbMessage.MESSAGE_FORMAT_3GPP to replace hidden SmsMgr APIs am: 125e446c18 am: d65fff9418 am: 3e89b5faac -s ours
am skip reason: Change-Id Id631875ba6639ebf4fa569696a982c49d9c93e8f with SHA-1 dd79281f97 is in history

Change-Id: Iad019370b8d17d20e331103546d3c6431937f369