Merge "Reporting the player's data source type in media analytics" into oc-dev
am: 64f9ce291f

Change-Id: I9d31c3005249461f63bddc88597cce939d6739d6