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

Change-Id: Idda7a70676bb3d6ac028482064c22e61180768f6