DisplayPowerController: fix upstream merge derps

Change-Id: I97922656ad5fdefe414e6828eaa41de5338f46ee