Rebase to master@68888117 am: 33d783ebdd

Original change: https://googleplex-android-review.googlesource.com/c/platform/tools/loganalysis/+/12776484

Change-Id: I716ceacd3af80e26113e1520d33147f7844e4820