Merge "dumpstate: Remove deprecated /proc/wakelocks" into nyc-dev
am: 4f6d8ab27c

* commit '4f6d8ab27cea2f2ff0f5353b847a3379c12814d7':
  dumpstate: Remove deprecated /proc/wakelocks