This reverts commit 3486259f9b. Reason for revert: fixed by aosp/2422419 Bug: 260366497 Bug: 264600011 Change-Id: I70d6d03c1bf17b28dd1cc878907551ae5503b09b
3486259f9b