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

Change-Id: I9f59483af300d8aa72cc7ee5bf5401e4c12c85ce