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

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

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



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