Merge "Merge "Add key layouts for Xbox clones" into rvc-dev am: 6f01c62d am: 69780947" into rvc-d1-dev-plus-aosp