28f664a3cb
This reverts commit d3c7eed166.
Reason for revert: <Droid monitor: Likely culprit for b/410713970 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.>
Change-Id: I672184a97d70dc3406514da8c2c0fa485c48eefa