Merge "Merge "Bluetooth airplane listener: Check for null" into rvc-qpr-dev...

Merge "Merge "Bluetooth airplane listener: Check for null" into rvc-qpr-dev am: d50ed0e7" into rvc-qpr-dev-plus-aosp am: c601013d am: d1abb26f am: e66ca5fd

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

Change-Id: I7332590f4b2cee6f58eac4faabe04cb506a75be2