commit 3bd7af35fc1f169a7d344ff1f02d2dd0658ea7fc
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Sep 30 00:07:38 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Sep 30 00:07:38 2023 +0000
tree 8d38f9be795cbfb76f92027df3c26da30db62bf5
parent 9165616f845fc02b7e10b984b86ea5b77e9e83ad
parent 356160bf43457231198ac5f41810423aeeb30b63

Merge changes from topic "am-5d8334fe3bef4d979c7c8e0ac715457e" into udc-d1-dev-plus-aosp

* changes:
  [automerger skipped] Merge "Use readUniqueFileDescriptor in incidentd service" into sc-v2-dev am: 7071381e4c -s ours am: 7aeb7533c5 -s ours am: 20543d2dec -s ours am: 5aa9945a9d -s ours am: af48d5b900 -s ours am: 998a2f7b48 -s ours
  [automerger skipped] Use readUniqueFileDescriptor in incidentd service am: db60b2f5e0 -s ours am: c55192b349 -s ours am: ea8ca5bdf8 -s ours am: 060219b837 -s ours am: 3d2d274c9a -s ours am: b05b6459fd -s ours