Merge "logd: consolidate command handling and fix an error check" am: 2666aaba84 am: 6252e97df4 am: 73c52ce2d4

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1393638

Change-Id: Ifc06c300723a46b964ed8f7a66dbc23409136bce