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

Merge "Add keylayout mapping for Xbox360 compatible controllers." am: e9e88881 am: cbd6b9bb am: 9db4acd3 am: 43f42ced am: fe42f1f9 am: 061ed74e

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



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