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

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

Change-Id: Ifa7f2c0a8424853b724173827b1221bb34686756