Merge changes from topic "am-5cc785dc345a4a569c11fea0ca4604e8" into udc-qpr-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: 83fd2399 -s ours am: ac83acc2 -s ours am: 1f533755 -s ours am: 5e63a8d6 -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: ea974c9a -s ours am: 53f4619a -s ours