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

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

Change-Id: I1ea41cb2a7758baef1f7860bfa9a86da06e1af51