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

[automerger skipped] Merge "Use readUniqueFileDescriptor in incidentd service" into udc-dev am: 3ed8f722 am: aa008ea9 -s ours am: fe1b159b -s ours

am skip reason: Merged-In Ibe03a17dee91ac5bf25d123d4fd9c0bdd3c7d80e with SHA-1 5ae8b810 is already in history

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



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