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

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

Change-Id: I50e2caca59ffd94db381826f68e3108bbb2850fb