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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11348255

Change-Id: I923735672fa658e443219d8fabbc4d4809c59c4f