[automerger skipped] Merge "Require CONFIG_HID_PLAYSTATION for DualSense key layout" into tm-dev-plus-aosp am: 6ea7f6c7 am: 294dad86 am: e6c3b55f -s ours

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

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



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