This reverts commit 99c1f9f4. Bug: 36844917, Bug: 36524925 Test: Pass MediaControllerTest Change-Id: I39425fd5f301e7825d6eab7c01ba94be2185ad01