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

Change-Id: I63784cae0d37c23ed99787d43c50f4d048a28a37