Fixing the state restore bug.
Fixing the state restore bug.

Change-Id: I30446a2d552b98fc69878bc7b4fc1a0fd358fc99

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base