Merge changes from topic "b/295948590" into main

* changes:
  Renaming DisplayPowerController2 after cleanup
  Removing DisplayPowerController