[automerger skipped] Merge "Use readUniqueFileDescriptor in incidentd service" into sc-v2-dev am: 7071381e4c -s ours am: 7aeb7533c5 -s ours am: 20543d2dec -s ours

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

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

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