am 2a04ec35: am 07ee12aa: Merge "logd: worst uid record watermark"

* commit '2a04ec3546a7f1d82b927dd2f49fe46f13f5fe2c':
  logd: worst uid record watermark