Merge "Catch IllegalStateException when updating Bluetooth A2DP codec info"
am: ad62fd52c9

Change-Id: I790c24917705ed7488ddfa467cb6c09241b34142