This reverts commit 761d4a0ccf.
Reason for revert: A fix can solve the issue for which this revert was created
Bug: 196856709
Bug: 218391941
Bug: 218267535
Test: Safetynet test
Test: health/mpts/heavyweight
Ignore-AOSP-First: pending fix for logcat privacy issue
Change-Id: I54222244b2aa6a9f307ed61629608abe12db1e3d