Merge "Add keylayout mapping for Dualsense Edge gamepad" am: ae04dc29af am: e54abbb3f2

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

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