Resend aosp/3445142

Not revert^2 to avoid potential automerge issue, because the previous
change failed to auto-merge into internal branch (b/389693264 logged for
it)

Bug: 380222284

Test: m nothing --no-skip-soong-tests
Change-Id: Ie55e98597cb931a4e3e84ae595317f3cc21192c9