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

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

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

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



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