Merge "Make sure to cleanup views that couldn't be added" into tm-qpr-dev am: c01cce03

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



Change-Id: I7d52c9d73afd051076c6f4516272f7464fa88352
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>