Merge "Fix resource leak for logOutput when exception occurs before close" into main am: 47cb31599e

Original change: https://android-review.googlesource.com/c/platform/development/+/2951527

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