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

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

Change-Id: I722c85801f7e967f33bf41e08c01f6f3561347fc