Merge "logd: sepolicy dynamic rate limiting" am: 8954ef987b
am: f80377d73a

Change-Id: Ia920a417e95a87625775f0ac3a5151b8eb0948f1