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

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

Change-Id: I67566cbe5e398c2da24dad800efe3d3136fe4cd3