Merge "Prevent unwanted keypress actions during TV Setup." into oc-dev
am: 564d0bf1be

Change-Id: I1cd59a2966f692a4857343e21bf1586719939490