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

Change-Id: Ib4060339a4eef0142ee5796f843d43c4d1edcb3b