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

Change-Id: I061de949fe39ae3ebd8faf011564b8d9ebb0a332