Merge "Merge "Fix Bluetooth auto turns ON in airplane mode" am: 1b9f4dbd am: 4b6e138c am: c05648cd" into rvc-d1-dev-plus-aosp