Merge "destroy file handle in error case" into main am: 21f59cc198

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2789192

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