Merge "Handle reperenting of InlineContentView" into rvc-dev am: f8b9ddea71 am: a962563758 am: bf50afcb4e am: e6e30d2948

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

Change-Id: Id8c4a07af383ef3f58bad760b28fdb5a69dc3e03