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

Change-Id: I567042ca38e74e2ce228e4bb03c73095c8cf6513