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

Change-Id: I83e81bd944c36c0f96a213bf57f99e61a7b35404