Merge "Shell: Grant BLUETOOTH_PRIVILEGED permission to Shell" am: 69e560995c am: eada5871f4

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

Change-Id: I82645039ddaa7514992d3967b9a64efc77444896