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

Change-Id: Idbaef8dcf86ccbad0f8e216087229c153094f382