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

[automerger skipped] Merge "Use readUniqueFileDescriptor in incidentd service" into sc-qpr1-dev am: 34f6ef36 -s ours am: 4a3587d7 -s ours am: 2230add6 -s ours am: e15a749e -s ours am: da70c621 -s ours am: a036ba6f -s ours

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

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



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