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

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

Change-Id: Ia18fc12a4015296d59985b376b159a1560717d90