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

Change-Id: I57a60293bc5f3176a6b1a05cc69e6979a65bca86