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

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

Change-Id: Ib15c4dbf940a4c5e0c22a32c99e5343b92e0efc7