[automerger skipped] Merge "Use readUniqueFileDescriptor in incidentd service"...

[automerger skipped] Merge "Use readUniqueFileDescriptor in incidentd service" into sc-v2-dev am: 7071381e -s ours am: 7aeb7533 -s ours am: 20543d2d -s ours am: 5aa9945a -s ours am: af48d5b9 -s ours am: 998a2f7b -s ours am: 356160bf -s ours am: 329b3635 -s ours

am skip reason: Merged-In Ibe03a17dee91ac5bf25d123d4fd9c0bdd3c7d80e with SHA-1 6fe75d9d is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24605806



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