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