Merge "Merge "Prevent unwanted keypress actions during TV Setup." into oc-dev am: 564d0bf1be am: 98b181b25f" into oc-dr1-dev-plus-aosp
am: e3a9c1e1e4

Change-Id: Ibdbbcaf171b48c6027c65a03d2ba843d070d01c5