Merge "Rename for updating BluetoothA2dp API naming" am: 733e881a6d

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Bluetooth/+/1596235

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I632e40391ef35a40b9eb2b58cc1932734c446799