Revert "Test Fix SettingRobolectricTest Fail"

This reverts commit 818f77cd1f659fee8d2885002b69180774757149.

Reason for revert: Underlying issue fixed in ag/23454315.

Bug: b/275023433
Test: atest SettingsGlobalRoboTests

Change-Id: I1af272efd00b3c5bd35310512f5712d5d1c7d834
142 files changed