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

Change-Id: Iae04c321f57e33019861ebf60ea29256b0d63e29