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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I495175a647a1ce4d585911b0f3ffda9455ed8e5e