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

Change-Id: Ib1cc394c3efdba379ed117b7b64b27adedc6452c