[automerger skipped] Merge "Pass bearerData and serviceCategory to CB module for CDMA" am: 234ede4445 am: 8cd40be2c9
am:b86e749dd2-s ours am skip reason: change_id I98f79fbb384881de5cb65fa7fe7a08b3f5b2e272 with SHA16d64fc657fis in history Change-Id: Iff07162c1d92b1f60276b589d507cee806949c07
This commit is contained in: