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

* changes:
  [automerger skipped] Merge "Use readUniqueFileDescriptor in incidentd service" into rvc-qpr-dev am: cf1a6b61 -s ours am: b4c962e9 -s ours am: ff77cd49 -s ours am: 5b33166e -s ours am: d03ed521 -s ours am: eacebc10 -s ours am: e165313a -s ours am: 3974acae -s ours am: f4cfdfa2 -s ours
  [automerger skipped] Use readUniqueFileDescriptor in incidentd service am: 6fe53e86 -s ours am: 20e9d071 -s ours am: 3606e96b -s ours am: c84972c6 -s ours am: 258d6314 -s ours am: b815f540 -s ours am: 9954e6b0 -s ours am: 827c25ca -s ours am: d675a2aa -s ours