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

Change-Id: I8f4d104bef04919b0ca74394a94d2d75b65ced6e