Merge "Camera:Fix the memory leak caused during HFR mode." into sc-qpr1-dev am: 4881b7d690 am: 47907370d3 am: 4c3bd328ea

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

Change-Id: I9374425d16a035c89ff5a230379eda97ba3fc6d3