[automerger skipped] Merge changes from topics "pc-enum", "pointer_controller"...

[automerger skipped] Merge changes from topics "pc-enum", "pointer_controller" am: 87099b04 am: 5bb6cfd7 -s ours

am skip reason: Change-Id Ie5ba68a5082fff6ccc85ab01ff49344b73d0bb1b with SHA-1 976db0c3 is in history

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

Change-Id: I7b2839400e76302a9501a712ecd3dd8356689d37