Merge "Migrate off of streaming logging" into main am: 65a9d4be am: 7a5c7f65

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2812995



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