Merge "Introduce a new user restriction for disallowing Bluetooth."
am: 1e9a5eac92  -s ours

Change-Id: I35d19d46b8edbacb66613e11a398c742f9d37029