3e5a34ea8e
This reverts commit ba11085635ea3ef9383b34dd44c43f2a6cd832ff. Bug: 36844917, Bug: 36525228, Bug: 36525325 Test: Pass MediaSessionTest and MediaControllerTest Change-Id: I4805ea58107b5fab8c9f5f0fcaffd1e0e4882ed8