base: Fix screen on stats after a boot

Prior to this change, the following sequence:

  * Turn the display off
  * Issue a reboot via adb
  * Unlock the device (after rebooting) before the screen turns off

results in the screen being on but the battery stats not reflecting
this fact.

In general, the mismatch occurs when either there is no serialized
battery stats state or when it is serialized in a state where the
screen is off.

Change-Id: I17374553fae6a08a1be8fdf445967509474177a9
GlobalActions: Fix Airplane Mode on/off issue
TRDS: Update

Change-Id: I5fb21c022ad507b6c49c2909d4897955311a9436

Conflicts:
	core/java/android/app/ResourcesManager.java
	core/java/android/content/res/Resources.java
	core/java/android/provider/Settings.java
	core/res/res/values/cr_symbols.xml
	packages/Keyguard/src/com/android/keyguard/KeyguardHostView.java
	services/java/com/android/server/UiModeManagerService.java