Merge "Add keylayout mapping for Xbox360 compatible controllers." am: e9e88881

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



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