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

Change-Id: Ieebc502abf65c59d2b231f13b7f40f6616c5c295