Merge "Fix targetSdkVersion gate for EXCLUDED_ROUTES compat change" into tm-dev