Merge "DO NOT MERGE Add Bluetooth toggle prompts - settings"
am: 8c11340b0c  -s ours

Change-Id: I60f481691445aeb4926b177d83f39077b9a72921