Merge "Update references to PowerManager constants that have moved." into jb-dev