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

* changes:
  Merge changes from topic "am-6fc7342924244409af40625086a7ba59" into udc-d1-dev-plus-aosp am: 9165616f -s ours
  [automerger skipped] Merge "Use readUniqueFileDescriptor in incidentd service" into sc-qpr1-dev am: 34f6ef36 -s ours am: 4a3587d7 -s ours am: 2230add6 -s ours am: eee8b8f0 -s ours am: 8ea60ca3 -s ours am: e7861a65 -s ours am: abb6a54f -s ours am: e56a310f -s ours