[N7100]Added Device settings back

Change-Id: Ic245e3a44902f8d3fd4fbb86de8f286f6ad6e7be
Merge "[N7100]Added Device settings back" into android-4.3