Merge "MediaMetrics: limit maximum memory used" into rvc-dev am: 3006a83565 am: e3b011a146

Change-Id: I8c230374b3af0c0f689b042ac3aaa48c534eafa4