Revert submission 25024821-b296056771-3

Reason for revert: Droidfood blocking bug: b/305648037

Reverted changes: /q/submissionid:25024821-b296056771-3
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:3cee7edf33438b74601e955244dffa3140984e64)
Merged-In: I55f78b2ff3bd7283f59dc2344a4052baf1c0b1dd
Change-Id: I55f78b2ff3bd7283f59dc2344a4052baf1c0b1dd