[automerger skipped] Merge "Release the surface control view host when addWindow fail." into tm-dev am: e3ae5cda am: 23ce8aee -s ours

am skip reason: Merged-In I024c64ce134235e487b6ab7cf33ba9fdf4079046 with SHA-1 0c6bc130 is already in history

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

Change-Id: I208ee5d2661abeb4e6a366cca55da70ede84e61c