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

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

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