[automerger skipped] Merge "Keep ArtStasLog write() functions" am: c8f3e70f...

[automerger skipped] Merge "Keep ArtStasLog write() functions" am: c8f3e70f am: a6f6e4f5 -s ours am: 391867e5 -s ours am: 043e431d -s ours

am skip reason: Merged-In I5ad0249b0aae87e98ebdd3deb6e8c58bfb691ebc with SHA-1 8c9302c9 is already in history

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



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