Added feature for surveys provider to Settings am: cd0fe608c5
am: 40c7468673  -s ours

Change-Id: Ia9bc949aca53111743a88ae8f6f11511107632d8