Merge "Merge "Fix Bluetooth auto turns ON in airplane mode" am: 1b9f4dbd am:...

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

Change-Id: Ib1bff65cbed89023e70bd2bbc3ce2597e2165815