Merge "dumpstate: Close API FDs on exec" am: b8ba6e9cc0 am: bab1e600e3

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2043435

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