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: Ibbba169de93ef19c1065d3fd555e840f1fea9818
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>