Merge "Catch IllegalStateException when updating Bluetooth A2DP codec info" am: ad62fd52c9 am: 14eb8cfe57
am: 8e81cf1310

Change-Id: I513fdf69abc617944f5e0ce8195d16a451f61590