This reverts commit d33537a8. Reason for revert: aosp/1844583 Bug: 213942757 Change-Id: I346d9fd60be099c3e393fb67df82456cb6f63668