[automerger skipped] Surface: Release references to BlastBufferQueue and SurfaceControl on Surface#destroy am: fe4d05cd44 -s ours am: f8fc9cf0ee -s ours am: 63f0e2db6b -s ours am: 298e3e2299 -s ours

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

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

Change-Id: I91206c76b99cec6040e6ba5840e2bba75d861bb2