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

Change-Id: I77cd63033413eadb4385d844bb2b83ef9dbef320