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

[automerger skipped] Merge "Use readUniqueFileDescriptor in incidentd service" into sc-dev am: 35410749 am: 7abb3af3 am: 546ca60c -s ours am: f5d94475 -s ours am: c0db83d9 -s ours am: f844a8e6 -s ours am: e32de38b -s ours am: 859ce385 -s ours

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

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



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