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

Change-Id: I37bc906365689e6d5c760e747e02a85dacb6f38c