This reverts commit addff744.

Reason for revert: Likely causing b/305726574 b/305901414, will verify
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:dd57a938c6d0f1c7af20a1dd4f84e32360e9d292)
Merged-In: Iacaab00ffe18b2fd6b5aeba6b5baf0794767430c
Change-Id: Iacaab00ffe18b2fd6b5aeba6b5baf0794767430c