commit 76c8fc2ea850c65a35cff63eefd8e1fd6361d4c5
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Sep 30 01:02:09 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Sep 30 01:02:09 2023 +0000
tree 2b81556229c63dc55b59f1e551773fb34cb2d002
parent 3cb7566827377ce333f4f5f6a3d13ece13179de1
parent fc18f4dbdf30f450de749fe8425b41a8ecf988d5

Merge changes from topic "am-5cc785dc345a4a569c11fea0ca4604e8" into udc-qpr-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: 83fd239996 -s ours am: ac83acc21f -s ours am: 1f5337557a -s ours am: 5e63a8d66c -s ours
  [automerger skipped] Use readUniqueFileDescriptor in incidentd service am: db60b2f5e0 -s ours am: c55192b349 -s ours am: 2dc2a0f284 -s ours am: 1e761d77a8 -s ours am: ea974c9a17 -s ours am: 53f4619afe -s ours