Merge commit 'c19efc4acb5a188650e0e04813899c0a143b4a96' into eclair-plus-aosp * commit 'c19efc4acb5a188650e0e04813899c0a143b4a96': Fix b/2105945 - Windowshade not closed when device locked.
Merge commit 'c19efc4acb5a188650e0e04813899c0a143b4a96' into eclair-plus-aosp * commit 'c19efc4acb5a188650e0e04813899c0a143b4a96': Fix b/2105945 - Windowshade not closed when device locked.