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

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

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