Merge "libprocessgroup: Change per-API level task profiles to override the diffs"