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

[automerger skipped] Merge "Use readUniqueFileDescriptor in incidentd service" into udc-qpr-dev am: 34178fa6 am: 2b9c6335 -s ours

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

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



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