Settings: Update Legacy Options' Position

PS6:
- Fix imports

PS7:
- Fix layout resources

PS10:
- Test onPrepareOptionsMenu changes

PS13-14:
- Rebase

PS17-18:
- Redo

PS19-20
- Remove CM's Performance Settings, whitespace fix

PS21
- Fix a build error

Signed-off-by: Andre Saddler <ayysir@aospal.com>
Change-Id: Ife7b152a832ebdd9b5eb066158e0d71fc834dc73
Settings: Add proximity wake-up toggle

Change-Id: I2f2449eb324f61b2f7a93acd91b99f144930e66e

Signed-off-by: anerikg <anerikgames@gmail.com>

Conflicts:
	res/xml/display_settings.xml
	src/com/android/settings/DisplaySettings.java