[automerger skipped] Merge "Use readUniqueFileDescriptor in incidentd service" into rvc-qpr-dev am: cf1a6b6131 -s ours am: b4c962e9c2 -s ours am: ff77cd4970 -s ours am: 5b33166e7e -s ours

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

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

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