This reverts commit 9420ba7515.
Reason for revert: Likely culprit for b/366196741 and b/366191730
Bug: 353950224
Fix: 366196741
Fix: 366191730
Change-Id: Icc84aaaae1a6bd8b21f059331715fb25163793b8
This reverts commit 9420ba7515.
Reason for revert: Likely culprit for b/366196741 and b/366191730
Bug: 353950224
Fix: 366196741
Fix: 366191730
Change-Id: Icc84aaaae1a6bd8b21f059331715fb25163793b8