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

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

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

Change-Id: Ic0099dc368438f4c453b4e05f73b764121efdc5d