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

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

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