Merge "Bluetooth: Use content observer for airplane mode" am: 8871623b8d  -s ours
am: 4ddee9722d

Change-Id: Ia3653b1737eb48d52eed98c3b6ba99d8e95636d7