tree 1ad3c959ac4d18d96545ce68748ab0d42686cbd0
parent e4227877c0ff4a985fc533b4de4f21ff674f2106
parent 478c28bbc8aef1f5c621b79f28ff0ddb9557e317
author Jane Ha <hatrang@google.com> 1681854690 +0000
committer Presubmit Automerger Backend <android-build-presubmit-automerger-backend@system.gserviceaccount.com> 1681854690 +0000

[automerge] Ignore-AOSP-First: merge conflict. see aosp/2545210 2p: 478c28bbc8

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/common/+/22720079

Bug: 266871187
Change-Id: I0e0cf64cf255df1b2c9a58b72b6a5c22aa3c512b