Merge "Move media expiration to MediaDataManager" into rvc-dev am: 61ee50f7 am: 189fb115 am: e26c3834 Change-Id: I7b605abb3b919fe9fe3a4fc14cc547ae84867ce2