Merge "Remove unstarted freeze surface before starting new freeze" into...

Merge "Remove unstarted freeze surface before starting new freeze" into sc-v2-dev am: d0e86ae5 am: 7df019f5

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

Change-Id: I07a7c40ba698b8e6d5dbe9857c86b366d41fe71d