Merge "Add Bluetooth toggle prompts - settings" am: de037d5491  -s ours
am: ce2a10b743

Change-Id: If2a0712b38cfd85af1502e68bdda39d1be8735b6