Merge "Update string from "Add device" to "Pair new device" in Setting > Connected devices" into pi-dev
am: fe522dc2db

Change-Id: I380123375af5eed570915472d4ae34402d6af006