This reverts commit 4424b8eadb.
Reason for revert: b/448534072
Bug: 447398317
Cherrypick-From: https://googleplex-android-review.googlesource.com/q/commit:25dc779fa9f90c0f3b3110d26862e932571a4ff2
Merged-In: I093281ccb70db30891aa020027285bc5b5c3450d
Change-Id: I093281ccb70db30891aa020027285bc5b5c3450d