Merge changes from topic "fastbootd-reset-fd" am: 04a4a10ee1

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2032465

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