Merge "Add logcat APIs." am: e6b57e4a05 am: 0d1016edf6

Original change: https://android-review.googlesource.com/c/platform/development/+/2264282

Change-Id: I3434777bc19ef9a399db40ca425e2a2e3b967d50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>