Merge "Move display power controller to display manager service. (DO NOT MERGE)" into klp-modular-dev