Merge "Handle reperenting of InlineContentView" into rvc-dev am: f8b9ddea am: a9625637 am: 848c1098 am: bda4f694

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

Change-Id: I8b9fb3061c7bd4f6b5db258283bbff8843952301