[automerger skipped] Merge "Allow SHELL_UID to disable Bluetooth for testing" into sc-qpr1-dev am: f8579cf75d -s ours
am skip reason: Merged-In Id45a43b824b2be49fb38686f9582484931024187 with SHA-1 c4b27dfce3 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15597636
Change-Id: I4558be575ef47a29a80f07752c32568fce056219
This commit is contained in: