This reverts commit 0f05b489. Bug: 73083791 Test: CTS (I08618dcd7707e5857ed8f8f01fd78b4129cd5804) Change-Id: I8a95725c8453d94f406c2c14d2c3555dc1c2901f