b29dabce18
This reverts commit 27bfcaa651.
Reason for revert: b/232636570
Bug: 229789612
Bug: 231711806
Bug: 231706480
Bug: 232063941
Bug: 232283628
Change-Id: Ic83515173f4a64228a80f63d75db938243cbf625