Merge "Add -c option for dumpsys usagestats" into pi-dev