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