Merge "Add null pointer checks when updating A2DP configuration values" am: 6f7437580c am: bd3f96703c am: fae23e1e00
am: 73aa2c6b3f

Change-Id: Iac81cb29671c198414a53c517deb6db962294d0a