Merge "Remove circular ref from MessagingLinearLayout" into rvc-dev am: f33516115a am: 8b4a786347

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

Change-Id: Ieed8117e61fdfbb309e0ec40b0fc65f3e03f291e