[automerger skipped] Surface: Release references to BlastBufferQueue and...

[automerger skipped] Surface: Release references to BlastBufferQueue and SurfaceControl on Surface#destroy am: fe4d05cd am: 002acf0b -s ours am: 40d12c5d -s ours

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

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

Change-Id: I8d92c14bac6dace7f468d3a070ec843190f41aa4