Merge "Introduce a new user restriction for disallowing Bluetooth." am: 5fb37a7641  -s ours am: 8058dc0e82  -s ours
am: ad5eb744aa  -s ours

Change-Id: I2468b18021198c8b1a7dfa739d28ec1aaafba9b1