Merge "Add keylayout mapping for Xbox360 compatible controllers." am: e9e88881a2 am: cbd6b9bbab am: 9db4acd342

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

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