Merge "Merge "Fix Bluetooth auto turns ON in airplane mode" am: bc501515 am:...
Merge "Merge "Fix Bluetooth auto turns ON in airplane mode" am: bc501515 am: 5948e313 am: de7c25d3" into rvc-d1-dev-plus-aosp am: 9666b3bc
Change-Id: I3de4cf8b4d154f59ba4de3f5235c4bae03cfda9e