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

Change-Id: I72fdd97ae0cd7c69a77cf1fc6df730bdbec00a3e