Merge "Introduce a new user restriction for disallowing Bluetooth." am: 1e9a5eac92  -s ours am: 0a21ba22e3 am: 6a3e0921fe
am: ecb5e3a665

Change-Id: I114ca5f59473119a7f9f732fc8cfafcf03fa1251