Merge changes from topic "am-6fc7342924244409af40625086a7ba59" into udc-d1-dev-plus-aosp

* changes:
  [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: eee8b8f0 -s ours am: 8ea60ca3 -s ours am: e7861a65 -s ours am: abb6a54f -s ours
  [automerger skipped] Use readUniqueFileDescriptor in incidentd service am: d28f10d8 -s ours am: 1710efa3 -s ours am: 053190aa -s ours am: 8c14fab9 -s ours am: cfaf0132 -s ours am: 1d489b52 -s ours am: e82ab3bd -s ours