[automerger skipped] Merge "DO NOT MERGE SF: Fix releaseBufferEndpoint merge issue" into sc-v2-dev am: ee4a87b8 am: 815353e0 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I42f260c95e4e2b92579027789ba99fd4cba0f72b