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

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

Change-Id: I48d93dc731b491a1e06a9c494fb7695e2de20f76