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

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

Change-Id: If79beea227f93678f4f875c0f374d1d38dac7cfa