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

Change-Id: I07a046ca392e9bd4655d0bc4b027771b622e8c71