Merge "leanback: workaround VideoView forcing focus problem" into nyc-mr1-dev
am: ae1b0bdaae

Change-Id: Iba281825445688f9993456b7f27c7fac7f3928d2