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

Change-Id: Ie8013060f95211d01364858635bc790eaf357915