[3/3] Settings: Built-in superuser

PS2: Fixed formatting issues

Change-Id: Ia38f5a7737b7aff1d4d8291285dd1a17a5e63c1e
Signed-off-by: Parthipan Ramesh <parthipan.ramesh@gmail.com>
Merge remote-tracking branch 'PA/kitkat' into kitkat