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

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

Change-Id: I276c792b22f4cc3f7f04dbb4d26b48358b205cd1