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

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

Change-Id: I6b82ac87f058e7cec2ddb733f1dade8d26320292