[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: 72193975 -s ours am: 343ae6b6 -s ours am: 7a933b39 -s ours

am skip reason: Merged-In I5c7e43736f025fc0965eae2f19719ba40df3cb70 with SHA-1 26ed4744 is already in history

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

Change-Id: I3e3f6919e27015b5c495f093a0f39e8ee24fce02