Merge "Use standard colors in logcat color output" am: 7382be402a am: 2b5725828a

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

Change-Id: Ie695fc717cbc0e161d06315843b67c32a03204fd