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

[automerger skipped] Merge changes from topics "pc-enum", "pointer_controller" am: 42875c3a am: 3d90c6db -s ours am: 60b103b6 -s ours am: 7a24828a -s ours

am skip reason: Change-Id I6c7bfc91023ce6cd2dc8f82b0d72731f871ad3ea with SHA-1 12956dc5 is in history

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

Change-Id: I2d2988deb3072c934b71bce1d634ff84434cfac1