Merge "Fix the memory leak during high speed recording" into udc-dev am: 22b1341a am: 2a3fec99

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23125244



Change-Id: Ib8312e0b43380633845c552ad04d8357f6e35eee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>