Merge changes from topic "am-381eacf5c375496798a5dfe8f367b457" into udc-qpr-dev-plus-aosp

* changes:
  Merge changes from topic "am-c970b13b8bc24d6ca3de8d829c260c12" into udc-d1-dev-plus-aosp am: dd5fdd87 -s ours
  [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 am: d945ebab -s ours