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