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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib85e8e5fc634513814e9f9284f89cd86c16769f1