Merge "Move GsmSmsCbMessage to CBReceiver test app" into stage-aosp-master am: 85bd3433a8

Change-Id: Ia9a368f2c4e7dd4f58ce16de2e490262f91b1dd4