Merge "Remove view based on known index of the view on exception" into...

Merge "Remove view based on known index of the view on exception" into tm-qpr-dev am: 31f6e65c am: c11bab5b

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



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