Track own MediaProvider

Change-Id: Ia484f77dc8542ef0e5dbf41f460c9c9cbdbce590
Signed-off-by: Dirk Rettschlag <dirk.rettschlag@gmail.com>
Merge "Track own MediaProvider" into jb-mr1

Conflicts:
	default.xml

Change-Id: I24789784422e594a8b8995232210f7c640f3e027