Merge \"Disallowing bluetooth config for demo users\" into nyc-mr1-dev
am: 0ce03e77bc

Change-Id: I89d396d0450c241fc1314cd8320ed2c6d02b9823