am 35e59cbe: am cefc41fd: Merge "Update references to PowerManager constants that have moved." into jb-dev

* commit '35e59cbed9136287920fc22ad793db648635b361':
  Update references to PowerManager constants that have moved.