Merge "Revert "Prevent NPE in PulseExpansionHandler"" into rvc-dev am: 2acde9a908

Change-Id: I1a796183e6b2b8c6f376a07d217246be28fb6e91