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

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

Change-Id: I7e867315af290bc63a9c95d120b73dd33d5700f6