commit a88b0da43d756baa1c62daf0569137fccd958e9c
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Sep 30 00:08:19 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Sep 30 00:08:19 2023 +0000
tree 8d38f9be795cbfb76f92027df3c26da30db62bf5
parent dd5fdd875f2c484c0cbc6eca2085c3830d5847ac
parent 0d66a72556d268d700dbaced71e6f0bb50fd0d19

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

* changes:
  [automerger skipped] Merge "Use readUniqueFileDescriptor in incidentd service" into sc-qpr1-dev am: 34f6ef3664 -s ours am: 4a3587d70c -s ours am: 2230add689 -s ours am: eee8b8f052 -s ours am: 8ea60ca336 -s ours am: e7861a65a3 -s ours am: 964bedcd19 -s ours
  [automerger skipped] Use readUniqueFileDescriptor in incidentd service am: d28f10d80a -s ours am: 1710efa382 -s ours am: 053190aa45 -s ours am: 8c14fab944 -s ours am: cfaf013295 -s ours am: 1d489b527e -s ours am: e135228f7e -s ours