This reverts commit 8ecc679d.

Reason for revert: DroidMonitor-triggered revert due to breakage https://android-build.corp.google.com/builds/quarterdeck?branch=git_main&target=cf_x86_64_auto-next-userdebug&lkgb=10881379&lkbb=10881575&fkbb=10881450 , bug b/302695414 .
Bug: 302695414

Change-Id: I6d2e402b69fbb4b828909cb184745710346ac473