This reverts commit 98f8122702.
Bug: 221909684
Reason for revert: DroidMonitor-triggered revert due to breakage https://android-build.googleplex.com/builds/quarterdeck?branch=git_tm-dev&target=redfin-user&lkgb=8232732&lkbb=8232913&fkbb=8232913, bug b/221909684
Change-Id: I33ba12dbdfdc730fac70de96e0a9166bdccfa769