Merge "Leanback: fix late selection of BaseRowsFragment" into nyc-support-25.2-dev am: 473c3eeeab
am: 143d281dba

Change-Id: Ia5104e6691248ddb68bebb5d7ebf4d4af8b036f4