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

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



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