Merge "Revert "Made unfocusable views in RecyclerView visible when using key navigation"" into nyc-support-25.2-dev am: ab6fca26c2
am: bce0f89e38

Change-Id: If5e31cd8ac35c0bedf160934b2d197eec03e8ffb