This reverts commit 65a18675. Bug: 73226650 Test: runtest-MediaComponents Change-Id: Id0efcc6517735024c650548e4042630b26611ac9