Merge "Catch IllegalStateException when updating Bluetooth A2DP codec info"