Merge "Release SurfaceView surface if viewrootimpl surface is not valid" into rvc-dev am: 8089c386 am: cb2b1748 am: 31aa622a am: 6107b462

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

Change-Id: Icd48b36b962d553bd465846c2829a694f03b5471