[automerger skipped] Merge "Use readUniqueFileDescriptor in incidentd service" into tm-qpr-dev am: 1492058aa8 -s ours am: ced0112783 -s ours am: b744140fa9 -s ours

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

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

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