[automerger skipped] Merge "Camera: Remove app segment stream's locked buffer...

[automerger skipped] Merge "Camera: Remove app segment stream's locked buffer tracking" into rvc-qpr-dev am: aab6038b am: 99da7fc6 -s ours

am skip reason: Change-Id I02522bcc695ee00ac4ee48df4cfd76ce35522cb9 with SHA-1 89775b97 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1d82098c6cde57e6033754b104b0dc6a9ea0aa67