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

Change-Id: Ia8a2a01e23e7be403092da5796f57374f78ea8af