Merge "Enable count-based expiration for media metrics" into qt-dev am: 239ff11cdb am: 69b360177a
am: 07366746c5

Change-Id: I2b98e519a4b48c2657ef05678678658bf585d30c