Fixed an issue where scrolling didn't work anymore after going to landscape am: f629b618a4 am: e3a958a448

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

Change-Id: I215b33cc379c773b899dc6f5b32c6fbbac98e840