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