Merge "Merge "Fix issue where media would not expire" into rvc-dev am:...
Merge "Merge "Fix issue where media would not expire" into rvc-dev am: 2cdbcea8 am: dc782f58" into rvc-d1-dev-plus-aosp am: cce403e1
Change-Id: I8a3aa060c4a2772220f29af216326e06a5e5d229