Merge "Use default methods for MBMS group call callbacks" am: 256640541f
am: 93bae4c4bc

Change-Id: I359250a309e57167e75bf9e8c1d81144569d71a0