Merge "Add Bluetooth toggle prompts - settings" am: de037d5491
-s ours am: ce2a10b743
am: 6e8a67c008
Change-Id: I0fc40f9a3f3a8488e696727d08084f2d2b9d2d75
This commit is contained in: