[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 -s ours am: 892082b8 -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: I7a4080d74c2938c4001b81a42b24ca57bf03d5b1