Merge "Move media expiration to MediaDataManager" into rvc-dev am: 61ee50f7 am: fcb8128a am: 1fb05205 am: 4e4b1305 Change-Id: I347690aa7ba6c4277f32065e14d9aed2cf4681be