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

Change-Id: Ic5c75e1f01fc53daf0a042be9210fdc23e302709