Forward port "Display options: allow configuration of wake on plug behavior"

From http://review.cyanogenmod.org/#/c/47159/

Change-Id: If1d50cbad76763bb8e12b2e7a4f7c21f42a58f31
DevelopmentSettings: Fix up save Advanced reboot state

This introduced on http://review.cyanogenmod.org/#/c/54859/

Change-Id: Ic4e2e5c5c3e4bd7649b6d715462c1bb63484a692
Merge "Forward port "Display options: allow configuration of wake on plug behavior"" into cm-11.0
Merge branch 'cm-11.0' of https://github.com/CyanogenMod/android_packages_apps_Settings into cm-11.0

Merged changes from upstream