This reverts commit 7c263ddd582abacbbe9c71341a6ef4c704d12100. Fixes: 35944608 Bug: 21305922 Test: Manual Test: Updated CTS and core tests pass. Change-Id: Ic840f8771c3d5850f4f6f44ea199b144cac740c0
This reverts commit 7c263ddd582abacbbe9c71341a6ef4c704d12100. Fixes: 35944608 Bug: 21305922 Test: Manual Test: Updated CTS and core tests pass. Change-Id: Ic840f8771c3d5850f4f6f44ea199b144cac740c0