[automerger skipped] Release the surface control view host when addWindow...

[automerger skipped] Release the surface control view host when addWindow fail. am: 0c6bc130 -s ours

am skip reason: Merged-In I024c64ce134235e487b6ab7cf33ba9fdf4079046 with SHA-1 8e59bb3d is already in history

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

Change-Id: I5fd975366f2bc6d3024f87d69351907fabe00f7c