Merge "Merge "Add keylayout mapping for Xbox360 compatible controllers." am: e9e88881 am: cbd6b9bb am: 9db4acd3 am: 43f42ced" into tm-d1-dev am: ddfbfcba am: a897b47d

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



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