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