Merge "Add BluetoothMapClient to system API" am: 9cabf5a07b am: 0a5ceea870 am: 2c4a4be615

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5f8b277c6f9e8ecb847285108ef4cc1b856516fe