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

[automerger skipped] Merge "Use readUniqueFileDescriptor in incidentd service" into tm-dev am: 2ac86ba5 am: 58e1853a -s ours am: 95ce9dcf -s ours am: 73cd0894 -s ours

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

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



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