Merge changes from topic "am-e17ce38d11674041aa2eac04f5d5acb3" 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: 7f3c529d -s ours am: 18696190 -s ours am: 7599f1fe -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: c4f2357b -s ours am: 0d6d2c7c -s ours am: b53fb543 -s ours