Merge "Don't throw exception for inflation after removal" into rvc-dev am: ae72005349 am: 78cf7f71ec

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

Change-Id: Id28ac292b8ad325731861703e21d431ecc721ee4