[automerger skipped] Merge "Surface: Release references to BlastBufferQueue and SurfaceControl on Surface#destroy" into sc-qpr1-dev am: 7219397532 -s ours am: 343ae6b623 -s ours
am skip reason: Merged-In I5c7e43736f025fc0965eae2f19719ba40df3cb70 with SHA-1 26ed47443c is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15754902
Change-Id: I93f85f3a59484c7d96bd1072479f9430748061a7
This commit is contained in: