Added survey support to second fragment type

Settings was totally redesigned which led several
screens to change what type of fragment they
extended. Unfortunately this broke surveys for some
required screens so survey support was added to the
second fragment type to fix this.

Test: Survey tests (robotests)
Bug: 34820704
Change-Id: Ic59b74c17c3d69c67600ce6a56f9f1835d2e1dda