Merge "ScopedFileDescriptor: better error on close" am: a77a55242a

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If6444828cc8dd1b13fda8be6031d864d0e1e2ced