Merge changes from topic "am-9094483288d943e1b012a32040f6978f" 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: e15a749e -s ours am: da70c621 -s ours am: b400b298 -s ours
  [automerger skipped] Use readUniqueFileDescriptor in incidentd service am: d28f10d8 -s ours am: 1710efa3 -s ours am: 053190aa -s ours am: 23fa02d9 -s ours am: bfa378df -s ours am: 95ac817b -s ours