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: ba34c5b1 am: e4af3bb9

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

Change-Id: I69c6e8412813cbb04425ec910019c90790845638