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

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

Change-Id: Ib2002d16ca0dbe07a45f688cb8fec4c6a1b3d793