Merge "Adding Xbox One S gamepad (model 1708) CTS tests."
am: 9abb2a3cd7

Change-Id: I27baf20484b263973b6d420b8d74878fbe15e80d