Merge "Mediaserver memory increase after record" am: 6c6a7a8865 am: 2963fb1ddd am: 7417392140

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1512711

Change-Id: Ic3bfdf1ee32c0ef186de3befbaffb38c22ee9381