Merge "Refactor of PointerController" am: 3ca2400a53 am: adaedfa3fa

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

Change-Id: I46f3a14b56c18ae2977791e81ea5d768f5e163f3