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

Change-Id: Ie5f7b5157a6034ec7a206758b19cd51e3713fc12