Merge "Don't update height if recycler view was scrolled" into rvc-qpr-dev am: a7f7189c

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

Change-Id: I6c985b4cfab343e1adef1db586ca4357752f57b4