Merge "Context-aware Bluetooth airplane mode"
am: d3a0117720

Change-Id: Ia2e5afa286657e2700a4246ec5d73a5426945d4a