Merge commit 'ec7dab76d41f07d88fc3e8932c430ef7d50fb5a7' into eclair-mr2-plus-aosp * commit 'ec7dab76d41f07d88fc3e8932c430ef7d50fb5a7': When phone is ringing, power button should hang up phone in addition to turning off the screen.