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

Change-Id: Id3081b6deb390efe4ecec7b56b0d4703aea38e9d