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: I053c043a626f8ef8e6537e1cf5de450cce78dfbd