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

[automerger skipped] Merge "Use readUniqueFileDescriptor in incidentd service" into rvc-dev am: 61621c95 -s ours am: b97477cd -s ours am: b4e7f02f -s ours am: a525c08d -s ours

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

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



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