Merge "Add missing null pointer check for Bluetooth A2DP Codec Settings" am: 78115c0abc
am: 0356b740f2

Change-Id: I359020a85c6bc8a5201018f31f5f9fd274b2b94d