Settings menus: aosp-ify

Change-Id: Idb1057430ef390a551995bf00a610849554ca1a9
Merge "Settings menus: aosp-ify" into kk-4.4