Merge "Merge "Keep ArtStasLog write() functions" into tm-dev am: 1fa02f66...

Merge "Merge "Keep ArtStasLog write() functions" into tm-dev am: 1fa02f66 am: f96c02e2" into tm-d1-dev-plus-aosp am: a9fcc7cc

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



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