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

Change-Id: I6460fb58be9ecac4bbd4f13ad61537704bd4a150