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: Idcc2b9bb3061f13afefca12b2988bd76b7d91cd7