Merge "Leanback: fix regression caused by fixing error prone" into nyc-support-25.4-dev