Merge "Reduce the memory usage of the ProtoLogToFile" am: 7b6b5be1 am:...

Merge "Reduce the memory usage of the ProtoLogToFile" am: 7b6b5be1 am: fe27b2ed am: e6541545 am: 435f9c37 am: 7ef484c6

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



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