appcompat Fix keyboard tests for TV am: 448bdf2663
am: 3880a632e2

Change-Id: I0d06c4ddeb6c074c45530d46b34b3e07e66657fe