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: 34f6ef3664 -s ours am: 4a3587d70c -s ours am: 2230add689 -s ours am: e15a749eb7 -s ours am: da70c621ac -s ours am: b400b298d3 -s ours
[automerger skipped] Use readUniqueFileDescriptor in incidentd service am: d28f10d80a -s ours am: 1710efa382 -s ours am: 053190aa45 -s ours am: 23fa02d9e2 -s ours am: bfa378df38 -s ours am: 95ac817be0 -s ours