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

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



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