Merge "appcompat Fix keyboard tests for TV" into nyc-support-25.1-dev
am: 4678cabf1f

Change-Id: If3d5d4622a1ce07b550d7a805755b6ade0f45b3a