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

* changes:
  Merge changes from topic "am-91ac0a10ba254e1cba155fbdc425f5e3" into udc-d1-dev-plus-aosp am: b8eab01d -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: 7f3c529d -s ours am: 18696190 -s ours am: d68be37f -s ours am: 90b4c404 -s ours