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

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



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