Camera: Fix FD leak am: 0765e02674 am: cf234fe759 am: d8ad9122d0 am: 10ea4947cd

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/24040326

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