Merge "Fix restoring vertical scroll after horizontal." into rvc-dev am: b3670743 am: f4644641

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

Change-Id: Ia59f5d7d56f3b49c744e954e76d35ca080d00d9c