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

Change-Id: Iad2d2f0eb8f92860edb5d0f5ca3c33cb80e98282