[automerger skipped] Merge "Surface: Release references to BlastBufferQueue...

[automerger skipped] Merge "Surface: Release references to BlastBufferQueue and SurfaceControl on Surface#destroy" into sc-qpr1-dev am: 5bcc5bd9 am: 0db52704 -s ours am: 55d1bb0d -s ours

am skip reason: Merged-In I88fe98fa275dd76e20a5403c24bd2cb3bee5346d with SHA-1 95b6d51f is already in history

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

Change-Id: Id77c7abd6b7bf8d1f89749d7fd12fa6a7a7fe7d8