Track our mediaProvider

Change-Id: I4ca86c436ac98c6c6e683889e11cd837c45cc1fb
Merge "Track our mediaProvider" into kitkat