Merge "Add null checks to EMBMS AIDL impls" am: 9e93a6515e am: 7bfd87f169
am: 38088cbca2

Change-Id: Ie162853f505c6cebc429805e1839227901d13276