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

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

Change-Id: Ib252733ed70389794f64897f0d76e93acfb6cfdc