Merge changes from topics "pc-enum", "pointer_controller" am: 87099b04c3

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1356005

Change-Id: Ic488bb0dff329b12afe882371be98406add26f6e