Merge "Move media expiration to MediaDataManager" into rvc-dev am: 61ee50f7ae am: 189fb115a0

Change-Id: I972624db61f27cbb1da93fa00ab8267b345b1a7d