Merge the SuperUser feature branch into int/n/fp2

* origin/dev/n/FP2N-175:
  su: Introduce conditional for building

Issue: FP2N-175
Change-Id: I8481c443ad959abedcd16863764c85e1917d3f10