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

Change-Id: Ie24c544d54a920473daee898a2044512ddc9f006