[automerger skipped] Merge "Reset buffer after stop protolog to file" into...

[automerger skipped] Merge "Reset buffer after stop protolog to file" into tm-qpr-dev am: b08c1d3a -s ours

am skip reason: Merged-In If618dad902df3c7fc1b2a943fe550c7c34a2d65e with SHA-1 0ae7f50d is already in history

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



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