[automerger skipped] Merge "Reduce the memory usage of the ProtoLogToFile"...

[automerger skipped] Merge "Reduce the memory usage of the ProtoLogToFile" into tm-qpr-dev am: c4647111 -s ours am: 370f66ae -s ours

am skip reason: Merged-In I368278df6f801b2b2b67974089d4a7f4147d91cc with SHA-1 4f44cf75 is already in history

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



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