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: b419521c47 am: ae60101b
Change-Id: Ia0edd31471a03522754dc1e4463bf3d93ebce793