Merge "Revert "Fixed focus transfer for GridLayoutManager and Leanback picker widgets"" into nyc-support-25.2-dev
am: 004e15ce37

Change-Id: I92fef5e4ff5eaf0e278b9d3a5f3736281023199c