Merge "Fix restoring vertical scroll after horizontal." into rvc-dev am: b367074347 am: f4644641c6 am: 672a7f1c77 am: 4376c92250
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11838099 Change-Id: I871c19f1f62ee64795b57c1c9235386ae72e585b
This commit is contained in: