tree 28d1793e04a782f281621f2996d3cb8fdca2ee4b
parent 5102cb705eea41c113fe8f21ca20f4bfbfb278b8
parent 5794d99ee661408f9cbadea723e2eae6ffda428e
author Jane Ha <hatrang@google.com> 1681945836 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1681945836 +0000

[automerge] Ignore-AOSP-First: merge conflict. see aosp/2545210 2p: 478c28bbc8 am: 85c55349df am: 5794d99ee6

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

Change-Id: Ib31ddb700bcde3cbf71854e189e5bfa19d1811d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>