Revert "PM: A few power updates from aosp-common/android-3.4"

This reverts commit c30fc3a3559473b0dbd202149a0838f0aa7a806d.