[automerger skipped] Merge "Require CONFIG_HID_PLAYSTATION for DualSense key...

[automerger skipped] Merge "Require CONFIG_HID_PLAYSTATION for DualSense key layout" am: f116c051 am: 5c1bd631 -s ours am: 4f37d9a5 -s ours

am skip reason: Merged-In I7e46ae1943cd2c63b8c0b03fdf5d71adeea89f6f with SHA-1 8169da18 is already in history

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



Change-Id: I28ff2ba9722988b1affe8f08a3d3cac08123df79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>