Merge "Prevent NPE in PulseExpansionHandler" into rvc-dev am: 6727245a59

Change-Id: I02a4f3367b39e21c0679865be5017937ba860a03