Merge "Add aggregated partial wakelock time per uid" into oc-dev