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

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

Change-Id: I1c9b3034dbabbbb7e6ff4bbcd786e482cd67fcfa