Merge commit 'a038decb21419c42a70c83a84c3b8ba152524913' * commit 'a038decb21419c42a70c83a84c3b8ba152524913': Revert "Don't activate keyguard if screen is turned off while proximity sensor is active."
Merge commit 'a038decb21419c42a70c83a84c3b8ba152524913' * commit 'a038decb21419c42a70c83a84c3b8ba152524913': Revert "Don't activate keyguard if screen is turned off while proximity sensor is active."