Merge "DO NOT MERGE Add Bluetooth toggle prompts - settings" am: 8c11340b0c  -s ours am: 0d60028669  -s ours am: f1342adb86
am: 1c4f12c6db  -s ours

Change-Id: I63dce574c3f4f42a4d02d1e0105f02fd32e68ba3