am 3f55d2f4: Merge "logcat: test: modernize"

* commit '3f55d2f4e69dd155d558fc2aa38e6f9bb0900152':
  logcat: test: modernize