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

Change-Id: I814c6e5a9032c6a28c2b3087311d6c51647e0bc4