Merge "Migrate off of streaming logging" into main am: 65a9d4be am: 8f786c9f am: 8c5b96e7

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



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