Merge "Move media expiration to MediaDataManager" into rvc-dev am: 61ee50f7ae am: fcb8128a73 am: 1fb052050e am: 4e4b1305ea

Change-Id: I347690aa7ba6c4277f32065e14d9aed2cf4681be