Merge "Ensure null media player does not crash Telecom."
am: 3f3349b92d

Change-Id: Ib99dd40f1fa3d78644438eb69ef673dc5da1199d