Merge "Move media expiration to MediaDataManager" into rvc-dev am: 61ee50f7 am: fcb8128a am: 72b121c7 am: d7b3a529 Change-Id: I74d9b63db9fc03724a5fa68e8ccd49a07dd76af4