Merge "logd: logcat --clear respect pruneMargin" am: 3d0186b97e
am: daae7558e8

Change-Id: I7fc1b18b080083fd7a48b1bcec8ec8e11139d4d2