Merge changes from topic "am-5d8334fe3bef4d979c7c8e0ac715457e" into udc-d1-dev-plus-aosp

* changes:
  [automerger skipped] Merge "Use readUniqueFileDescriptor in incidentd service" into sc-v2-dev am: 7071381e -s ours am: 7aeb7533 -s ours am: 20543d2d -s ours am: 5aa9945a -s ours am: af48d5b9 -s ours am: 998a2f7b -s ours
  [automerger skipped] Use readUniqueFileDescriptor in incidentd service am: db60b2f5 -s ours am: c55192b3 -s ours am: ea8ca5bd -s ours am: 060219b8 -s ours am: 3d2d274c -s ours am: b05b6459 -s ours