Fixed focus transfer for GridLayoutManager and Leanback picker widgets
am: b0818cc234

Change-Id: Id353be07e034d5fd6cd0756e81cda6b0675962bc