Merge "New @SystemApi's in BluetoothMapClient" am: f97b80ebd7 am: 490121697e am: b92748937f

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

Change-Id: I47b5102392b9469ee3e34c1b3288c976a32e8b2e