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: I9b0919075bc6e29cf4beb6d2e92097d74ac4d99b