Fix derp.

Change-Id: I2766f4c89460c967e32349be008e38b3600b7e76
Fix Setting->Display always force close issue

CTS's AdminTest will change the display timeout to 5 seconds.
It will cause Setting->Display 100% force close. It has been reported in
http://code.google.com/p/android/issues/detail?id=27026 . This patch is
for solving this issue.

Change-Id: Icf4061023f040ee164d161b9db717acbc9697124
Dont enable Wi-Fi if it's not toggleable in flight mode

Dont enable Wi-Fi if it's not toggleable in flight mode
by restoring the return which was removed by
e78c1879058571c00879f0d3e756951302adf513

Change-Id: I8ca5a3e9b3f36f148f08ce97b8a2b854bf7de21c
Lockscreen : Gesture Unlock

Change-Id: I154ccdd26f4607f4b6f4d0ad1fe795dc25bd630b