am 48d88c4b: am 6bb48f07: Merge "logd: worst uid record watermark part three"

* commit '48d88c4b69c4c336bda808364e7150a76cd02c3d':
  logd: worst uid record watermark part three