Merge "Reduce the memory usage of the ProtoLogToFile" am: 7b6b5be19c am: fe27b2ed66

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

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