Merge changes from topic "am-220181b418934292815b4357cd241987" into main

* changes:
  [automerger skipped] Merge "Use readUniqueFileDescriptor in incidentd service" into sc-v2-dev am: 7071381e -s ours am: 7aeb7533 -s ours am: 83fd2399 -s ours am: ac83acc2 -s ours am: 0073aad2 -s ours
  [automerger skipped] Use readUniqueFileDescriptor in incidentd service am: db60b2f5 -s ours am: c55192b3 -s ours am: 2dc2a0f2 -s ours am: 1e761d77 -s ours am: ce207420 -s ours