Revert "Fix build failure in release branch"

This reverts commit b1c9647eabe1a13c8d43a2519ae1e2117133fd43.

Reason for revert: fails build after revert original fix

Bug: 406880479
Cherrypick-From: https://googleplex-android-review.googlesource.com/q/commit:4d41392e80c274f2816196c5f75cdccbd83f1489
Merged-In: If98dd07eb6dfeeef4fd226d7d72ae22e225d552b
Change-Id: If98dd07eb6dfeeef4fd226d7d72ae22e225d552b