Merge "Revert "Introduce a new user restriction for disallowing Bluetooth."" am: 4eb075e89f -s ours am: 834725f579
am: 96fe993907
Change-Id: I6f3b70920942f03549c60f55437855e1f7c31f22
This commit is contained in: