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