Add AOSP version
(cherry picked from commit 963cb165c77d3c084e0e11812187c336898f660c)

(cherry picked from commit 44987456bcf7eb8187184a08456c50d942ba8d0a)
Add AOSP version 2

(cherry picked from commit 7ca6927d6f1a876123c8ec31a53cd65788f105c5)

Conflicts:
	res/values/cr_strings.xml
Reorder Settings

(cherry picked from commit e4b17777b1adea41606f1e775a9eb0a861989d7b)

Conflicts:
	res/xml/settings_headers.xml
add display advanced strings
(cherry picked from commit a0300d48584bee60d9bcb750781ff653c47bfd6e)
Move Systemui to Interface

(cherry picked from commit 326a4db87a164e3585999e70a08e86c7a4204e21)