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

Change-Id: I04f7187c23a0f17c5ef2d37f75d892e4da54111e