Merge "logd: worst uid record watermark part three"