Merge "Remove the eng tag from invoke_mock_media_player" am: 2e29def109
am: b19dc43a0b

Change-Id: I913c8a43526257f475dc2830ee58b62d96f8c9c4