This reverts commit bcf577a4. Change-Id: I6d4a2aec4faf8ad4722a1c94c48858aebf408674 Test: runtest frameworks-services Bug: 73660232