Merge "Refactor of PointerController" am: 3ca2400a53 am: adaedfa3fa am: 15bbc06795 am: 13d7aeb155

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

Change-Id: I62e8f66b29381355999a354a69258d006658193e