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 am: 4376c922

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

Change-Id: I871c19f1f62ee64795b57c1c9235386ae72e585b