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

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

Change-Id: Ie071494ca55736478f445086cc9d8c2f4aeaf9e1