[ADI][16/N] Fix build after auto-merge

This commit is empty because the merge conflict has been addressed in
previous CLs. This commit is kept to retain the CL orders.

FLAG: android.content.pm.verification_service
BUG: 360129657
Test: n/a

Merged-In: Iff589135bbcf701e3e67337ac68f8e608e63a3e9
Change-Id: Iff589135bbcf701e3e67337ac68f8e608e63a3e9