[ADI][15/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: I23ab0322bdbe8eeaeebb8b689099c3873f65ce07
Change-Id: I23ab0322bdbe8eeaeebb8b689099c3873f65ce07