Merge "Merge "Camera: Fix a wrong erase call for app segment buffer" into...

Merge "Merge "Camera: Fix a wrong erase call for app segment buffer" into rvc-dev am: 453044a3 am: f3975879 am: 847c4d49" into rvc-qpr-dev-plus-aosp am: 07166815

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

Change-Id: I870fb42749b78b2547ad2c4da92818d25917bfa9