Merge changes from topics "pc-enum", "pointer_controller" am: 42875c3a99

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

Change-Id: I359f1393852de5df2c6d93115a4d971d9b6c3d0c