Merge "Update BluetoothA2dp API" am: ae6583b34f am: e90bacbc0a am: 51beeda872

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1596413

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I234ca0e0c123293a56516e1ed461bfbd9f5b1481