Merge "[automerger skipped] Merge "Surface: Release references to...

Merge "[automerger skipped] Merge "Surface: Release references to BlastBufferQueue and SurfaceControl on Surface#destroy" into sc-dev am: f632b440 -s ours am: 3aa1729d -s ours am: 4fcdb99c -s ours" into sc-v2-dev-plus-aosp am: 4064c296 -s ours

am skip reason: Merged-In I5c7e43736f025fc0965eae2f19719ba40df3cb70 with SHA-1 43b0f37a is already in history

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

Change-Id: I3a979eb723ee9f0d0b928982a0f4e43fd7467d64