Merge "logcatd: add stop and clear actions am: 2d737011d6  -s ours" into nyc-mr1-dev-plus-aosp