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

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

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



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