Merge "Surface: Release references to BlastBufferQueue and SurfaceControl on Surface#destroy" into sc-dev am: f632b44030

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

Change-Id: I02e44bda4b554b9543a421cf9370c0dfef9c3d1b