[automerger skipped] Re-enable unit test in A2dpServiceTest for...
[automerger skipped] Re-enable unit test in A2dpServiceTest for EVENT_TYPE_CODEC_CONFIG_CHANGED am: 7b8d48e3 -s ours
am: 00ed32e0 -s ours
Change-Id: Ib98fe85938c37e818710468bee393d42d55a5a78