[automerger skipped] Merge "Move GsmSmsCbMessage to CBReceiver test app" into stage-aosp-master am: 85bd3433a8 am: 7a50bb8889 -s ours
am skip reason: Change-Id Ia1d19356c34f9a13638c10d1c1b9e53c6b69fddd with SHA-1 803c885513 is in history

Change-Id: I58fdfe0a3712f42d56dea9f856b144b66e2f69a7