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

Change-Id: I1d84e927e8cd05c51285fba9226b1bd9f2c1c12a