This reverts commit e710fd8504.
Reason for revert: Revert for 25Q4 release. will cp the revert cl to 25Q4-release
Bug: 434700998
Test: flash rom and verified it
Flag: NONE revert
Cherrypick-From: https://googleplex-android-review.googlesource.com/q/commit:b648c0a872f65b6e79861fd0a5f749ba93a9755f
Merged-In: I6d28e5270ae36200d00c01b96917b58896025ae4
Change-Id: I6d28e5270ae36200d00c01b96917b58896025ae4