Merge "Reset buffer after stop protolog to file" am: 18493d62 am: 140fb234

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



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