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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7c1657e3e3c07aa1f47ef6aa5b06badf69b9d2d7