Merge "Playback activity monitoring: add player types" into oc-dev
am: faa2cdfa47

Change-Id: Ic22415e166e94e9a1d3301557b8fe36afce9d29f