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

Change-Id: Ieaf8521bfcf614108b6b97a9282b312b4081ba43