Merge "logd: worst uid record watermark part three" into mnc-dr-dev