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