Merge "Refactor of PointerController" am: 3ca2400a53

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

Change-Id: I7345f718b827c049072459abebd5b13ddecdd138