Merge "Camera: Fix a wrong erase call for app segment buffer" into rvc-dev am: 453044a3a0 am: ab6412a687

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

Change-Id: I5109110a1a61226596047f2b9d0139b51c285adb