Merge "leanback: fix errorprone warnings" into nyc-support-25.4-dev