modded device info screen 2

(cherry picked from commit 8dd698749fc87bc7bc9c779a66b5c6aef9c1704c)
Added adam_aosp

(cherry picked from commit bdf9a19c7a54eebff8baab4d53ff9b4fef21de1a)
Reorder settings
(cherry picked from commit 10ac7589772ddaab14caf27a797488fd2bad1c50)
modded device info screen