[automerger skipped] Merge "Add support for GamePad api in...
[automerger skipped] Merge "Add support for GamePad api in ITvRemoteServiceInput." into rvc-dev am: 7dd4f1af am: 19026f94 -s ours
am skip reason: Change-Id I49612fce5e74c4e00ca60c715c6c72954e73b7a3 with SHA-1 3b92b968 is in history
Change-Id: I3b7474552569fe0c5bee611c98c57ec289f513f1