This reverts commit bac3e50f.

Reason for revert: b/331855635
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:34ee990ee72693cd534d7d696f3a52c9c5a5bfd8)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:e214741ee05dd6bad9bf1d7a62c1448c7eee4332)
Merged-In: I471269cb5ecd4aef32c6648ad575baea44b562d1
Change-Id: I471269cb5ecd4aef32c6648ad575baea44b562d1