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

Change-Id: Ib8e0c0de03368190f5eaa6b1fff4c920fe7ba9c7