Merge "Pass bearerData and serviceCategory to CB module for CDMA" am: 234ede4445
am: 8cd40be2c9

Change-Id: I3f49a2081ab2c5a365d1c7fdf1bdd22bece809e2