Revert Media 1.0 API changes for mainline module

Bug: 119539695
Test: pass MediaSessionTest, MediaControllerTest, and
      MediaSessionManagerTest
Change-Id: I2453dfcd3852c77a825b5ed5db197591303a6115
9 files changed