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

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

Change-Id: Ia99bffadb72600a0df7af5ce58a3d77e42431b79