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

Change-Id: Icc13b2847d8a7b6f0800bd067ac3fe3e01c478ec