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

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

Change-Id: I2bfda2c779df8e9d35d69081b5acaadbfa13a64e