Merge "Playback activity monitoring: add player types" into oc-dev am: 8caf56ef7c
am: 883d667c42

Change-Id: Ifb03e4fbfce459cbe6ad245f3557b2267591cbbc