Merge "Revert "Introduce a new user restriction for disallowing Bluetooth.""...
Merge "Revert "Introduce a new user restriction for disallowing Bluetooth."" am: 592ee7e1 -s ours am: 3f971603
am: 8c9eaf88
Change-Id: I6f3b70920942f03549c60f55437855e1f7c31f22