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

Change-Id: Ibb6fd7576f48912637626a885382badf79513f17