am 15258ac8: Fix power manager display wake lock bugs.  (DO NOT MERGE)

* commit '15258ac86bb397206ac44c073baf184ffa0e62f2':
  Fix power manager display wake lock bugs.  (DO NOT MERGE)