Merge "Move media expiration to MediaDataManager" into rvc-dev am: 61ee50f7ae am: 189fb115a0 am: e26c3834ff am: 4bd49b24f0

Change-Id: I641abdbdbfa0c9b10290e1af9be914d91b39c32c