tree d9b26da97275cc8e547a6657f0c4ab95b8c3aa4b
parent be5a94b276884f9de846bab3e2430c24ba9be31a
author Hugo Drumond Jacob <hugojacob@google.com> 1689790426 +0200
committer Ray Chin <raychin@google.com> 1690186371 +0000

Fix duplicated `data` field

While merging this from `android12L-test-dev` to `main`, the `data`
field got duplicated.

Merge the duplicated entries into a single one.

Change-Id: Ie97857cf1d4a41fd479e100616b533265c807de8
Merged-In: Ie97857cf1d4a41fd479e100616b533265c807de8
Bug: 285215697
(cherry picked from commit 19e99ad003838ace452fba806e60c818e67d3366)
(cherry picked from commit ee31a6e6c21bd44cc66a02a41116efc91341ad65)