Merge "Added SystemApi tag to BLUETOOTH_MAP permission." am: e44cf60fe5 am: 655d7f9857

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

Change-Id: I092bb6bfcfe72bda5ad7272860b39801a4bcbe1b