Resend aosp/3444766

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

Bug: 380222284
Bug: 383062486

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