Fix compile error in different build variant

- aosp/3341662 didn't get merged to internal main
- ag/30674610 fixed that but needed a change so it compiles in all
  configs
- this CL applies the same change to AOSP, but with a merged-in stanza
  to prevent downstream conflicts

Bug: 369375199
Test: treehugger
Flag: android.security.keystore2.Flags.FLAG_ATTEST_MODULES
Merged-In: I7195aaca849eb53e603565a470b780ba91b3ec2c
Change-Id: I58f3c9a17894123d5536c0d556e2d1eb5ce90888