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

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

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

Change-Id: Iad03dc7e226015f622225c243a7de027b506af06