[automerger] TWS-A2DP: Remove TWS+ codec entry hack am: 01b41f4d8e

Change-Id: Idbae32c773641393f13714f6f2c5a31a27ce1c3f