Merge change 9512

* changes:
  Display a helpful label for PROXIMITY_SCREEN_OFF_WAKE_LOCKs in the output of "dumpsys power".