Settings: Move CAF strings

Change-Id: Ib272969ed9cb8020b243fdf57ab54151322d44ab
Show devices connected to the WiFi hotspot(2/2)

Change-Id: Icf51db5ae0204ed2bf153a5223aec986d3b496c4
Add Screen Off option for buttons double-tap/long press (2 of 2)

Depends on I7e0c21b174b9cdd020c8d27c91c4c72201e228ff (c/69163)

This is being done primarily to replicate functionality on find7 Color OS.
Would it be better/possible to have this change only affect the find7?
(Updated to address string concerns)

Change-Id: I6f0c07b6e6c7834194cbb766cd425850ba7df324
Merge branch 'cm-11.0' into kk_mkt