am 86c8be04: (-s ours) am 0c3177c5: am 64393789: Merge "logd: worst uid record watermark part deux"

* commit '86c8be04433d178a6cada30dddeb2d31c7d5de7b':