Merge "Add missing null pointer check for Bluetooth A2DP Codec Settings"