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

Change-Id: Id5e20cb105f5a3c11648f226f7b46317052353ce