Merge "Fix dumpstate read_file_as_long fd leak" into main am: df17b83c

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



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