Merge "Revert "Introduce a new user restriction for disallowing Bluetooth.""
am: 4eb075e89f  -s ours

Change-Id: Ibcc0b6db64260f444c5884ce9df39395d59a6158