This commit backports commit6be6c58206
to aosp/master. Bug: 72376227 Test: build only Merged-In: I332077a67cc9f9c83b298e25feea71463e1ee98b Change-Id: I332077a67cc9f9c83b298e25feea71463e1ee98b (cherry picked from commit6be6c58206
)
This commit backports commit6be6c58206
to aosp/master. Bug: 72376227 Test: build only Merged-In: I332077a67cc9f9c83b298e25feea71463e1ee98b Change-Id: I332077a67cc9f9c83b298e25feea71463e1ee98b (cherry picked from commit6be6c58206
)