Merge "Remove SurfaceFreezer leash when unfreeze" into sc-v2-dev am: ea3c85264d

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

Change-Id: Ia9dc94706d61b156f94fea388743fef68c0e8f51