Merge "Reduce log buffer waste." into tm-qpr-dev am: 24311a64 am: 6160a52d am: 705e616c

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



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