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

Change-Id: I576383ff8af91f1cbed2cd87e763c51a1b6f9f92