Merge "Reduce log buffer waste." into tm-qpr-dev am: 24311a6474 am: 6160a52da3

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20761386

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