[automerger skipped] Merge "Move GsmSmsCbMessage to CBReceiver test app" am: de1fa3078c -s ours am: 7b8b4e4595 -s ours
am skip reason: Change-Id Ia1d19356c34f9a13638c10d1c1b9e53c6b69fddd with SHA-1 171665a1bb is in history

Change-Id: Ie42c984ede70c7477e45cfa1fb15704a7225c09b